df@pippilotta.erinye.com
7eea7fff35
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
2007-06-19 12:10:48 +02:00
df@pippilotta.erinye.com
26d83baeaf
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-06-19 12:05:17 +02:00
df@pippilotta.erinye.com
f927d50509
try again.
2007-06-19 12:03:10 +02:00
tomas@whalegate.ndb.mysql.com
027456393e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-19 11:38:37 +02:00
tomas@whalegate.ndb.mysql.com
b36a87ae91
corrected typo
2007-06-19 11:38:07 +02:00
tomas@whalegate.ndb.mysql.com
9d8fbc462b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-19 11:31:52 +02:00
tomas@whalegate.ndb.mysql.com
955c40dece
WL#3303
...
- get the ndb flags right, so that the behaviour is as before
2007-06-19 11:31:25 +02:00
tomas@whalegate.ndb.mysql.com
04f1913789
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-19 11:26:23 +02:00
tomas@whalegate.ndb.mysql.com
a67e755593
turn off binlogging of the updates during wait for not_readonly
2007-06-19 11:25:19 +02:00
mats@kindahl-laptop.dnsalias.net
1447f6318f
Fixes to tests and test results.
2007-06-19 11:09:22 +02:00
thek@adventure.(none)
a0b8394c23
Merge adventure.(none):/home/thek/Development/cpp/bug28211/my51-bug28211
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-06-19 09:13:17 +02:00
tomas@whalegate.ndb.mysql.com
6a51e0f8a2
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-18 23:55:48 +02:00
tomas@whalegate.ndb.mysql.com
f3a7284521
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-18 23:49:30 +02:00
tomas@whalegate.ndb.mysql.com
55c6e7b142
check for different error message
2007-06-18 17:57:16 +02:00
thek@adventure.(none)
2da91b2316
Bug#28211 RENAME DATABASE and query cache don't play nicely together
...
When all table blocks were removed from the query cache the client session
hung in a tight loop waiting on an impossible condition while consuming a lot
of CPU.
This patch also corrects an error which caused valid tables to sometimes be
removed from the query cache.
2007-06-18 17:46:29 +02:00
pekka@clam.ndb.mysql.com/ndb13.mysql.com
405f6a1681
ndb - bug#29176 missing stack pruning in drop_page
2007-06-18 16:03:41 +02:00
tomas@whalegate.ndb.mysql.com
7d4467766f
correction
2007-06-18 15:41:02 +02:00
tomas@whalegate.ndb.mysql.com
e5565db7c6
Bug #28989 hpux11 ps_row warnings
...
- also remove printout for error 4009
2007-06-18 15:38:37 +02:00
tomas@whalegate.ndb.mysql.com
1c15d3e1a1
fixes Bug #25305 (and several other similar test tailures with the same symptom)
...
- make tests wait until ndb connects properly
2007-06-18 15:36:10 +02:00
mats@kindahl-laptop.dnsalias.net
07774f97e5
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
2007-06-18 12:44:21 +02:00
lars/lthalmann@dl145k.mysql.com
431067573d
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-06-18 12:12:27 +02:00
lars/lthalmann@dl145h.mysql.com
a2d93c53db
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-06-18 12:10:36 +02:00
lars/lthalmann@dl145j.mysql.com
721c3ea5e5
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-06-18 12:05:17 +02:00
lars/lthalmann@dl145h.mysql.com
c5c624a752
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-06-18 12:02:39 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
135a98309c
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-06-18 12:02:03 +02:00
mats@kindahl-laptop.dnsalias.net
5e4137730c
Fixes to make team-tree green.
2007-06-18 11:29:32 +02:00
lars/lthalmann@dl145j.mysql.com
ae52876fd0
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-06-18 09:42:22 +02:00
lars/lthalmann@dl145j.mysql.com
519e26e801
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-06-18 09:33:43 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bac8b8ab47
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-06-18 09:33:05 +02:00
svoj@june.mysql.com
674675a70c
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-06-18 11:49:36 +05:00
svoj@june.mysql.com
621dd1724e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-06-18 11:49:01 +05:00
svoj@june.mysql.com
491e471fb3
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-06-18 11:47:47 +05:00
df@pippilotta.erinye.com
7013c96fdf
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-06-18 07:58:51 +02:00
df@pippilotta.erinye.com
7cdb354d26
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-06-18 07:56:29 +02:00
jonas@perch.ndb.mysql.com
6d6eca5f3e
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-06-18 07:49:33 +02:00
jonas@perch.ndb.mysql.com
8308d3781b
ndb - bug#29167
...
Fix case where all node in node group dies before they saved sysfile (wrt gcp)
and Qmgr incorrectly thinks that "node group is missing"
2007-06-18 07:48:59 +02:00
df@pippilotta.erinye.com
f369105aa4
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
2007-06-18 07:42:13 +02:00
tomas@whalegate.ndb.mysql.com
1bfd45c277
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 22:07:21 +02:00
tomas@whalegate.ndb.mysql.com
795b9de49d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 22:06:47 +02:00
tomas@whalegate.ndb.mysql.com
4547957450
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 22:06:34 +02:00
tomas@whalegate.ndb.mysql.com
04ea0c3357
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-17 22:05:33 +02:00
tomas@whalegate.ndb.mysql.com
8a08ac40fb
correct test and result
2007-06-17 22:04:01 +02:00
tomas@whalegate.ndb.mysql.com
0d8c48da57
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 19:55:41 +02:00
tomas@whalegate.ndb.mysql.com
d20cc54cb8
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-17 19:54:54 +02:00
tomas@whalegate.ndb.mysql.com
d1516ed29e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 19:53:43 +02:00
tomas@whalegate.ndb.mysql.com
8eb940de27
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 19:52:01 +02:00
tomas@whalegate.ndb.mysql.com
b5f30a99f9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-06-17 19:50:07 +02:00
tomas@whalegate.ndb.mysql.com
885ca40f37
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 19:48:51 +02:00
tomas@whalegate.ndb.mysql.com
6b8e7c9484
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 19:47:56 +02:00
tomas@whalegate.ndb.mysql.com
ff804bc546
Bug #28989 hpux11 ps_row warnings
...
- do not print 701 dictionary busy error
2007-06-17 19:47:20 +02:00