Commit b806eea2 authored by jani@hynda.mysql.fi's avatar jani@hynda.mysql.fi
Browse files

Merge hynda.mysql.fi:/home/my/mysql-5.1-main 

into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
parents 45442d08 b7bef32d

.bzrignore

+8 −8
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
./mysql.sln

./mysql.suo

./prepare

.DS_Store

.defs.mk

.depend

.depend.mk
@@ -1178,6 +1179,7 @@ libmysqld/sql_parse.cc 
libmysqld/sql_partition.cc

libmysqld/sql_plugin.cc

libmysqld/sql_prepare.cc

libmysqld/sql_profile.cc

libmysqld/sql_rename.cc

libmysqld/sql_repl.cc

libmysqld/sql_select.cc
@@ -1279,6 +1281,9 @@ mysql-5.0.2-alpha.tar.gz 
mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz

mysql-test/*.ds?

mysql-test/*.vcproj

mysql-test/.DS_Store

mysql-test/funcs_1.log

mysql-test/funcs_1.tar

mysql-test/gmon.out

mysql-test/install_test_db

mysql-test/lib/init_db.sql
@@ -1367,9 +1372,12 @@ mysql-test/r/symlink.log 
mysql-test/r/system_mysql_db.log

mysql-test/r/tmp.result

mysql-test/r/udf.log

mysql-test/reg.log

mysql-test/rpl.log

mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/suite/funcs_1.tar.gz

mysql-test/suite/funcs_1.tar.zip

mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings

mysql-test/suite/funcs_1/r/innodb_views.warnings

mysql-test/suite/funcs_1/r/memory_trig_03e.warnings
@@ -3012,11 +3020,3 @@ win/vs8cache.txt 
ylwrap

zlib/*.ds?

zlib/*.vcproj
 
mysql-test/funcs_1.log

mysql-test/funcs_1.tar

mysql-test/suite/funcs_1.tar.gz

mysql-test/.DS_Store

.DS_Store

libmysqld/sql_profile.cc

mysql-test/suite/funcs_1.tar.zip

mysql-test/reg.log

client/mysqltest.c

+2 −2
Original line number Diff line number Diff line
@@ -7330,7 +7330,7 @@ void timer_output(void) 


ulonglong timer_now(void)

{

  return my_getsystime() / 10000;

  return my_micro_time() / 1000;

}

include/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ 
			my_getopt.h sslopt-longopts.h my_dir.h \

			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \

			m_ctype.h my_attribute.h $(HEADERS_GEN)

noinst_HEADERS =	config-win.h config-netware.h \

noinst_HEADERS =	config-win.h config-netware.h my_bit.h \

			heap.h my_bitmap.h my_uctype.h \

			myisam.h myisampack.h myisammrg.h ft_global.h\

			mysys_err.h my_base.h help_start.h help_end.h \

include/config-win.h

+3 −1
Original line number Diff line number Diff line
@@ -257,9 +257,11 @@ inline double ulonglong2double(ulonglong value) 
#define tell(A) _telli64(A)

#endif





#define STACK_DIRECTION -1



/* Difference between GetSystemTimeAsFileTime() and now() */

#define OFFSET_TO_EPOCH ULL(116444736000000000)



/* Optimized store functions for Intel x86 */



#ifndef _WIN64

include/m_string.h

+5 −2
Original line number Diff line number Diff line
@@ -129,7 +129,10 @@ extern size_t bcmp(const uchar *s1,const uchar *s2,size_t len); 
extern	size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len);

#undef bcmp

#define bcmp(A,B,C) my_bcmp((A),(B),(C))

#endif

#define bzero_if_purify(A,B) bzero(A,B)

#else

#define bzero_if_purify(A,B)

#endif /* HAVE_purify */



#ifndef bmove512

extern	void bmove512(uchar *dst,const uchar *src,size_t len);