- 01 Feb, 2007 5 commits
-
-
unknown authored
Need to change directory before calling mysql-test-run.pl
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg include/my_global.h: Auto merged include/thr_alarm.h: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_alarm.c: Auto merged include/my_pthread.h: Manual merged mysys/default.c: Manual merged mysys/my_thr_init.c: Manual merged sql/mysqld.cc: Manual merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg
-
unknown authored
into chilla.local:/home/mydev/mysql-4.1-axmrg include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/thr_alarm.h: Auto merged mysys/default.c: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_alarm.c: Auto merged mysys/my_thr_init.c: Manual merged sql/mysqld.cc: Manual merged
-
unknown authored
into chilla.local:/home/mydev/mysql-4.1-axmrg
-
- 31 Jan, 2007 4 commits
-
-
unknown authored
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines mysql-test/t/merge.test: Auto merged mysql-test/r/merge.result: Manually merged. sql/ha_myisam.cc: Manually merged. sql/ha_myisammrg.cc: Manually merged.
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines
-
unknown authored
When a merge table is opened compare column and key definition of underlying tables against column and key definition of merge table. If any of underlying tables have different column/key definition refuse to open merge table. mysql-test/r/merge.result: A test case for WL#3456. mysql-test/t/merge.test: A test case for WL#3456. sql/ha_myisam.cc: Moved a part of code that converts TABLE object to MyISAM key and column definition to a separate function. Added check_definition() function that compares MyISAM table definitions. sql/ha_myisammrg.cc: Check if underlying table definition conforms to merge table definition, and in case underlying table definition differs, refuse to open merge table.
-
- 30 Jan, 2007 2 commits
-
-
bk://localhost:5559unknown authored
into production.mysql.com:/usersnfs/jamppa/mysql-4.0 include/my_global.h: Auto merged include/my_pthread.h: Auto merged mysys/default.c: Auto merged mysys/my_pthread.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/thr_alarm.c: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
Move get_thread_lib to mysys/my_pthread.c Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms include/my_global.h: Fixed to be same as in 5.1 include/my_pthread.h: Move things around to be more in line with rest of code mysys/default.c: Fixed two wrong pointer incrementations. mysys/my_pthread.c: Cleanup: Use variable thr_client_alarm mysys/my_thr_init.c: Detect thread library at startup. Set also thr_client_alarm signal here, so that we get it in init_signals() in mysqld mysys/thr_alarm.c: Set thr_client_alarm depending on which thread library we are using sql/mysqld.cc: Move get_thread_lib to mysys/my_pthread.c
-
- 29 Jan, 2007 2 commits
-
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg BUILD/SETUP.sh: Auto merged configure.in: Auto merged include/my_global.h: Auto merged include/thr_alarm.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/symlink.test: Auto merged mysys/my_pthread.c: Auto merged sql/item_func.cc: Auto merged include/my_pthread.h: Manual merged mysql-test/r/myisam.result: Manual merged mysys/thr_alarm.c: Manual merged sql/ha_ndbcluster.cc: Manual merged sql/mysqld.cc: Manual merged
-
unknown authored
into chilla.local:/home/mydev/mysql-4.1-axmrg mysql-test/r/symlink.result: Auto merged mysql-test/t/symlink.test: Auto merged mysql-test/r/myisam.result: Manual merged mysql-test/t/myisam.test: Manual merged
-
- 26 Jan, 2007 2 commits
- 25 Jan, 2007 2 commits
-
-
unknown authored
Move get_thread_lib to mysys/my_pthread.c Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms include/my_global.h: Fixed to be same as in 5.1 include/my_pthread.h: Move things around to be more in line with rest of code include/thr_alarm.h: extern of thr_client_alarm mysys/default.c: Fixed two wrong pointer incrementations. mysys/my_pthread.c: Cleanup: Use variable thr_client_alarm mysys/my_thr_init.c: Detect thread library at startup mysys/thr_alarm.c: Set thr_client_alarm depending on which thread library we are using sql/mysqld.cc: Move get_thread_lib to mysys/my_pthread.c
-
unknown authored
into mockturtle.local:/home/dlenev/src/mysql-5.0-merge
-
- 24 Jan, 2007 23 commits
-
-
unknown authored
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12 sql/mysqld.cc: Auto merged
-
unknown authored
Fixed typo problem that surfaced after the merge
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines mysql-test/t/myisam.test: Auto merged
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines mysql-test/r/symlink.result: Auto merged mysql-test/t/symlink.test: Auto merged sql/table.cc: Auto merged mysql-test/r/myisam.result: Manually merged. mysql-test/t/myisam.test: Manually merged.
-
unknown authored
identical pushed_cond_guards arrays. Allocate only one always. mysql-test/r/subselect.result: BUG#24127: merge mysql-test/t/subselect3.test: BUG#24127: merge
-
unknown authored
the team tree for additional investigation.
-
unknown authored
into chilla.local:/home/mydev/mysql-4.1-bug24607
-
unknown authored
into mockturtle.local:/home/dlenev/src/mysql-5.0-merge mysql-test/t/disabled.def: Auto merged mysql-test/t/ps.test: Auto merged
-
unknown authored
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12 sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/subselect.result: Manual Merge
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-bug24607 mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged
-
unknown authored
After merge fix
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-bug24607 mysql-test/r/myisam.result: Manual merged mysql-test/t/myisam.test: Manual merged
-
unknown authored
Fixed test. On 32-bit machines which compile without -DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value. Using a value below 4G is portable. mysql-test/r/myisam.result: Bug#24607 - MyISAM pointer size determined incorrectly Fixed test results.
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
-
unknown authored
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
-
unknown authored
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
-
unknown authored
ndb/src/common/util/SocketClient.cpp: fix two problems recently introduced: - HPUX build problem - some connect errors not being detected properly
-