ingo@mysql.com
|
726ec9fa7a
|
Merge mysql.com:/home/mydev/mysql-5.1
into mysql.com:/home/mydev/mysql-5.1-bug8841
|
2006-02-14 13:46:19 +01:00 |
|
gluh@mysql.com
|
49606011f0
|
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
|
2006-02-14 12:53:49 +04:00 |
|
gluh@eagle.intranet.mysql.r18.ru
|
c42a608d6f
|
Bug#16591 Partitions: crash using information_schema.partitions
Bug#16695 Reading I_S.PARTITIONS with pre-5.1.6 partitioned tables crashes server
issue a warning in case of error during table opening
|
2006-02-14 12:52:38 +04:00 |
|
ingo@mysql.com
|
b4b5dc18c4
|
Merge mysql.com:/home/mydev/mysql-5.0-bug8841
into mysql.com:/home/mydev/mysql-5.1-bug8841
|
2006-02-14 09:29:37 +01:00 |
|
tomas@poseidon.ndb.mysql.com
|
dfe8bb9d4f
|
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-14 08:33:52 +01:00 |
|
tomas@poseidon.ndb.mysql.com
|
69280e63bc
|
disabled non deterministic test
|
2006-02-14 08:32:39 +01:00 |
|
bar@mysql.com
|
d967e6200c
|
Merge mysql.com:/usr/home/bar/mysql-5.0.cs_fs
into mysql.com:/usr/home/bar/mysql-5.1-new.fscs
|
2006-02-14 09:41:34 +04:00 |
|
bar@mysql.com
|
4f6ee962b7
|
Merge mysql.com:/usr/home/bar/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.1-new.fscs
|
2006-02-14 08:50:52 +04:00 |
|
bar@mysql.com
|
561d7a03aa
|
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.cs_fs
|
2006-02-14 08:25:09 +04:00 |
|
bar@mysql.com
|
cc3623aecf
|
Many files:
Backporting character_set_filesystem from 5.0 to 5.1.
|
2006-02-14 08:24:01 +04:00 |
|
lars@mysql.com
|
e9a8a765ef
|
Removed version information from test
|
2006-02-14 02:18:41 +01:00 |
|
tomas@poseidon.ndb.mysql.com
|
dd92e9a31a
|
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 23:27:50 +01:00 |
|
aivanov@mysql.com
|
e1a316bcc0
|
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/alexi/innodb/mysql-5.1-ss115x
|
2006-02-14 01:27:49 +03:00 |
|
aivanov@mysql.com
|
434c60bdf0
|
Deleted innodb_unsafe_binlog.test erroneously merged from
the innodb-5.0-ss115 snapshot.
|
2006-02-14 01:25:13 +03: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|