Use macros for working with "struct timespec" in event_queue.cc
Fix merge problem
include/my_pthread.h:
Remove merge problem causing "struct timespec" to be declared twice
Add macro "get_timespec_sec" used for retrieving the time in seconds
sql/event_queue.cc:
Use macros for working with "struct timespec"
sql/log_event.cc:
Add casts from "byte*" to "char*"
into siva.hindu.god:/usr/home/tim/m/bk/51
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
server-tools/instance-manager/instance.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
include/my_pthread.h:
Manual merge.
mysql-test/r/archive.result:
Manual merge.
mysql-test/t/archive.test:
Manual merge.
- Use same precision (milliseconds) for all time functions
used when calculating time for pthread_cond_timedwait
- Use 'GetSystemTimeAsFileTime' for both start and curr time
include/config-win.h:
Move all defines for 'pthread_cond_timedwait' to my_pthread.h
include/my_global.h:
Move all defines for 'pthread_cond_timedwait' to my_pthread.h
include/my_pthread.h:
Redefine "struct timespec" to better suite the needs
of 'pthread_cond_timedwait' for windows implementation
Add windows specific define for set_timespec_nsec
Move all defines related to pthread_cond_timed wait to same file
Declare union for reading FILETIME as __int64 with correct alignment
mysys/my_wincond.c:
Use 'GetSystemTimeAsFileTime()' both for getting start and current time
Use new members of "struct timespec"
Make sure the calculated timeout value never exceeds the value
passed to set_timespec/set_timespec_nsec
server-tools/instance-manager/guardian.cc:
Use set_timespec macro
server-tools/instance-manager/instance.cc:
Use set_timespec macro
into kpdesk.mysql.com:/home/thek/dev/bug17489/my51-bug17498
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysql-test/r/myisam.result:
SCCS merged
Merged 4.1->5.0. Updated myisam.test
mysql-test/r/myisam.result:
updated result file
mysql-test/t/myisam.test:
Removing symlink specific test from myisam test
into kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysql-test/r/myisam.result:
SCCS merged
mysql-test/t/myisam.test:
SCCS merged
- When this bug was corrected it changed the behavior
for data/index directory in the myisam test case.
- This patch moves the OS depending tests to a non-windows
test file.
mysql-test/r/myisam.result:
moved test from myisam to symlink; new result file
mysql-test/r/symlink.result:
moved test from myisam to symlink; new result file
mysql-test/t/myisam.test:
moved test from myisam to symlink
mysql-test/t/symlink.test:
moved test from myisam to symlink
into mysql.com:/usr/home/ram/work/bug22377/my50-bug22377
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
sql/sql_show.cc:
Auto merged
- Add printout in safe_connect indicating that mysqltest is in a loop waiting for
connection to mysqld. Will be printed when --verbose is passed as argument to
mysqltest
client/mysqltest.c:
Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite
- Add printout in safe_connect indicating that mysqltest is in a loop waiting for
connection to mysqld
- Windows opens stdin in text mode by default. Certain characters
such as CTRL-Z are interpeted as events and the read() method
will stop. CTRL-Z is the EOF marker in Windows. to get past this
you have to open stdin in binary mode. Setmode() is used to set
stdin in binary mode. Errors on setting this mode result in
halting the function and printing an error message to stderr.
client/mysqlbinlog.cc:
Apply fix to 5.0 as well
into naruto.:C:/cpp/bug17489/my50-bug17489
mysql-test/r/windows.result:
Auto merged
mysql-test/t/windows.test:
Auto merged
sql/sql_parse.cc:
Auto merged
into siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/51
include/mysql.h:
Auto merged
include/mysql_h.ic:
Auto merged
mysql-test/r/func_in.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
Makefile.am:
Manual merge
- test* targets are identical (as much as possible) to 5.0 & 5.1 versions
- use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
- PHONY: target includes all test targets
Makefile.am:
- test* targets are identical (as much as possible) to 5.0 & 5.1 versions
- use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
- PHONY: target includes all test targets
