Commit graph

30714 commits

Author SHA1 Message Date
aelkin@mysql.com
9321f6747c Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-13 23:38:12 +02:00
aelkin@mysql.com
1603a83120 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-13 23:36:23 +02:00
tomas@poseidon.ndb.mysql.com
efd6779c80 Bug #17340 SHOW CREATE TABLE from second session crashes the server
- no check was made that ndb thd object was allocated
2006-02-13 21:55:49 +01:00
aelkin@mysql.com
a5da4ce669 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
2006-02-13 22:00:11 +02:00
kent@mysql.com
08b8448e64 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-02-13 20:52:43 +01:00
tomas@poseidon.ndb.mysql.com
b04be2212f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-13 20:52:42 +01:00
aelkin@mysql.com
a744ab78ba Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 21:47:23 +02:00
aelkin@mysql.com
0d54c27d50 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-13 21:37:32 +02:00
tomas@poseidon.ndb.mysql.com
b1967abdce Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-13 20:35:35 +01:00
tomas@poseidon.ndb.mysql.com
87a6266fa4 Bug #17179 schema creation fails
-flag was set on field intable share instead of table
2006-02-13 20:34:36 +01:00
kent@mysql.com
d60b10d565 mysqlimport.c:
Removed C++ comment, changed types for pthread_create() usage
2006-02-13 20:21:15 +01:00
lars@mysql.com
5b66df060f BUG#17339: Missed line in previous patch 2006-02-13 19:52:57 +01:00
lars@mysql.com
dc81a3c7b9 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339
2006-02-13 19:46:53 +01:00
lars@mysql.com
0c6d1690d9 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-13 19:42:34 +01:00
lars@mysql.com
24bbbf0b8f Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339
2006-02-13 19:39:44 +01:00
brian@zim.tangent.org
14c05a7fd7 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-13 10:26:31 -08:00
brian@zim.tangent.org
778ca614a1 Fix for bad merge. 2006-02-13 10:21:33 -08:00
joerg@mysql.com
868b1678e7 support-files/mysql.spec.sh : Use "-i" on "make test-force", add missing changelog notes. 2006-02-13 19:07:40 +01:00
lars@mysql.com
11dde18f88 BUG#17339: Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
For this particular bug report it was rpl_loadfile.test that did not make proper cleanup, but the patch
includes fixes for other tests aswell.
2006-02-13 19:03:12 +01:00
lars@mysql.com
2325f5aea5 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-13 18:44:43 +01:00
paul@snake-hub.snake.net
fc347a68e8 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone3
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-13 11:42:48 -06:00
joerg@mysql.com
678e075ecf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/rpmspec-4.1
2006-02-13 18:23:08 +01:00
paul@snake-hub.snake.net
78f4f94059 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
2006-02-13 11:22:49 -06:00
paul@snake-hub.snake.net
5f2a401dba set_var.cc:
Fix out-of-order system variable.
2006-02-13 11:20:15 -06:00
aelkin@mysql.com
e7a0822a47 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
2006-02-13 19:17:02 +02:00
aelkin@mysql.com
0866e4267a Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 19:15:02 +02:00
aelkin@mysql.com
312f68133c Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-13 19:13:33 +02:00
joerg@mysql.com
47746b12c4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/rpmspec-5.0
2006-02-13 18:04:30 +01:00
joerg@mysql.com
bb1ba4bc98 support-files/mysql.spec.sh
"Use remote": Let the other changes (test the debug binary) precede.
2006-02-13 17:58:05 +01:00
joerg@mysql.com
5a8df170cc Merge mysql.com:/M50/rpmspec-5.0 into mysql.com:/M51/rpmspec-5.1 2006-02-13 17:09:03 +01:00
tomas@poseidon.ndb.mysql.com
ce10983ead forgot to commit in prev patch 2006-02-13 17:07:13 +01:00
lars@mysql.com
270011969a Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-13 16:16:59 +01:00
tomas@poseidon.ndb.mysql.com
9cf361af9b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-13 16:16:58 +01:00
tomas@poseidon.ndb.mysql.com
7db7cd462f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-13 16:15:41 +01:00
SergeyV@selena.
866914a6a0 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  selena.:H:/MYSQL/src/#00001-mysql-5.1
2006-02-13 18:06:03 +03:00
tomas@poseidon.ndb.mysql.com
9ec6f1ea57 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-13 16:06:02 +01:00
SergeyV@selena.
d19e124d98 Merge selena.:H:/MYSQL/bkt/mysql-4.1
into  selena.:H:/MYSQL/bkt/mysql-5.0
2006-02-13 17:51:22 +03:00
tomas@poseidon.ndb.mysql.com
619879276e Bug #17325 HA Testing: Node failed takeover for failed node (Array index out of range)
wrong arrGuard, see MAX_REPLICAS+1 0n row 6457
+ changed all 4 constants to MAX_REPLICAS
+ moved some arrGuards out of loops for optim reasons
2006-02-13 15:47:46 +01:00
SergeyV@selena.
b0136378cf Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  selena.:H:/MYSQL/src/#06536-mysql-4.1
2006-02-13 17:29:35 +03:00
SergeyV@selena.
89785ddb89 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  selena.:H:/MYSQL/src/#00001-mysql-5.1
2006-02-13 17:11:03 +03:00
lars@mysql.com
004f399057 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-13 15:02:51 +01:00
tomas@poseidon.ndb.mysql.com
ce04588ca8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-13 14:32:04 +01:00
brian@zim.tangent.org
0b30190c22 Disabling a test, I will look at it tomorrow. Something is wrong with the merge from 5.0. Its probably a flush that is missing somewhere but I am too tired to figure it out at the moment. 2006-02-13 05:31:43 -08:00
tomas@poseidon.ndb.mysql.com
9a3b27dae9 manual merge 2006-02-13 14:25:31 +01:00
brian@zim.tangent.org
2654daa8e3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-13 04:49:06 -08:00
brian@zim.tangent.org
f76c047305 Made mysqlimport link against mysys so that it could make use of the safe mutex functions. 2006-02-13 04:48:14 -08:00
anozdrin@mysql.com
5650e65d04 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree
2006-02-13 15:22:06 +03:00
brian@zim.tangent.org
30fdcc6be4 Merge zim.tangent.org:/home/brian/mysql/mysql-5.0
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-13 04:22:05 -08:00
brian@zim.tangent.org
f43fa4a688 Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows. 2006-02-13 04:11:22 -08:00
anozdrin@mysql.com
09fd20b284 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree
2006-02-13 15:10:03 +03:00