- 15 Dec, 2006 10 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint mysql-test/t/rpl_openssl.test: Auto merged
-
unknown authored
- Remove check not to run on windows. mysql-test/t/rpl_openssl.test: Remove check not to run on windows
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint scripts/mysqld_safe.sh: Auto merged
-
unknown authored
into shellback.:C:/mysql/mysql-5.1-new-maint
-
unknown authored
-
unknown authored
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*"
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/51 mysql-test/r/symlink.result: Auto merged
-
unknown authored
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/51 mysql-test/r/symlink.result: Auto merged mysql-test/t/symlink.test: Auto merged scripts/mysqld_safe.sh: Auto merged mysql-test/r/myisam.result: Manual merge mysql-test/t/myisam.test: Manual merge
-
- 14 Dec, 2006 29 commits
-
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/50 mysql-test/r/myisam.result: Manual merge. mysql-test/r/symlink.result: Manual merge. mysql-test/t/myisam.test: Manual merge. mysql-test/t/symlink.test: Manual merge.
-
unknown authored
mysql-test/r/myisam.result: Fix results file - a test was moved from the .test file, but the results were not updated. mysql-test/r/symlink.result: echo End of 4.1 tests while I'm here mysql-test/t/myisam.test: echo End of 4.1 tests while I'm here mysql-test/t/symlink.test: echo End of 4.1 tests while I'm here
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint extra/yassl/src/ssl.cpp: Auto merged scripts/mysqld_safe.sh: Auto merged sql/net_serv.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint client/mysqltest.c: Auto merged mysql-test/r/archive.result: Auto merged mysql-test/t/archive.test: SCCS merged
-
unknown authored
mysql-test/r/have_dynamic_loading.require: Rename: mysql-test/r/have_udf.require -> mysql-test/r/have_dynamic_loading.require mysql-test/include/have_udf.inc: Rename have_udf.require to hqave_dynamic_loading.require mysql-test/mysql-test-run.pl: Add support for ha_example plugin mysql-test/include/have_example_plugin.inc: New BitKeeper file ``mysql-test/include/have_example_plugin.inc'' mysql-test/r/have_example_plugin.require: New BitKeeper file ``mysql-test/r/have_example_plugin.require'' mysql-test/r/plugin.result: New BitKeeper file ``mysql-test/r/plugin.result'' mysql-test/t/plugin.test: New BitKeeper file ``mysql-test/t/plugin.test''
-
unknown authored
include/my_pthread.h: Fix botched merge - add struct timespec and set_timespec(), etc.
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
-
unknown authored
into qualinost.(none):/home/mtaylor/src/mysql-5.1-maint scripts/mysqld_safe.sh: Auto merged
-
unknown authored
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint scripts/mysqld_safe.sh: Auto merged
-
unknown authored
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/51 mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/50 mysql-test/t/myisam.test: Auto merged mysql-test/r/myisam.result: SCCS merged
-
unknown authored
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.
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
-
unknown authored
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
-
unknown authored
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
-
unknown authored
into naruto.:C:/cpp/mysql-4.1-maint
-
unknown authored
into naruto.:C:/cpp/mysql-5.0-maint
-
unknown authored
into shellback.:C:/mysql/mysql-5.0-maint
-
unknown authored
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint mysql-test/t/myisam.test: SCCS merged
-
unknown authored
- 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
-
unknown authored
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
-
unknown authored
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
-
unknown authored
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
-
unknown authored
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
-
unknown authored
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
-
unknown authored
- 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
-
unknown authored
into shakedown.(none):/home/jpipes/dev/mysql-5.1-maint include/mysql.h: Auto merged
-
- 13 Dec, 2006 1 commit
-
-
unknown authored
into shakedown.(none):/home/jpipes/dev/mysql-5.1-maint include/mysql.h: Auto merged
-