cmiller@zippy.(none)
512d1c7ff3
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
2006-07-10 17:20:39 -04:00
ingo/mydev@chilla.local
4cdb1469e0
Merge chilla.local:/home/mydev/mysql-5.1--main
...
into chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-08 10:54:54 +02:00
knielsen@devsrv-b.mysql.com
aebbf0ce00
Merge bk-internal:/home/bk/mysql-5.1
...
into devsrv-b.mysql.com:/data0/knielsen/tmp-5.1
2006-07-07 20:33:46 +02:00
konstantin/kostja@bodhi.netgear
a1f7b448e4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
2006-07-07 13:51:47 +04:00
ingo/mydev@chilla.local
49587d4b37
Merge chilla.local:/home/mydev/mysql-5.1--main
...
into chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-07 09:14:09 +02:00
knielsen@ymer.(none)
b5f8c6ea96
Merge ymer.(none):/usr/local/mysql/mysql-5.0-bug19951
...
into ymer.(none):/usr/local/mysql/tmp-5.1
2006-07-07 00:18:03 +02:00
konstantin@bodhi.netgear
4e23f9756d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge
2006-07-07 02:18:02 +04:00
tomas@poseidon.ndb.mysql.com
5e3861cb95
removed alter table partition error test since it cannot be made predictable... name will change of created file
2006-07-07 00:18:01 +02:00
knielsen@ymer.(none)
5ea51287d6
BUG#19951: Race conditions in test wait_timeout.
...
Fix random failures in test 'wait_timeout' that depend on exact timing.
1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.
2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.
2006-07-06 23:49:09 +02:00
ingo@chilla.local
1a98b89334
Merge chilla.local:/home/mydev/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-06 21:45:15 +02:00
konstantin@bodhi.netgear
01bc761690
Merge bodhi.netgear:/opt/local/work/tmp_merge
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
2006-07-06 22:55:48 +04:00
konstantin@bodhi.netgear
f22a50a93b
Merge bodhi.netgear:/opt/local/work/mysql-5.1-root
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge
2006-07-06 22:26:47 +04:00
tomas@poseidon.ndb.mysql.com
8f613e9263
Bug #20820 auto inc table not handled correctly when restored from cluster backup
2006-07-06 20:04:48 +02:00
tomas@poseidon.ndb.mysql.com
1db0b2c6a6
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 19:02:38 +02:00
tomas@poseidon.ndb.mysql.com
4199719438
Bug #20820 auto inc table not handled correctly when restored from cluster backup
2006-07-06 18:50:44 +02:00
tomas@poseidon.ndb.mysql.com
deb1884cef
corrected result file
...
- missing order by
2006-07-06 15:51:13 +02:00
ingo@chilla.local
44ed4b8ecb
After merge fixes.
2006-07-06 15:38:47 +02:00
ingo@chilla.local
db0e7774aa
Merge chilla.local:/home/mydev/mysql-5.0-ateam
...
into chilla.local:/home/mydev/mysql-5.1-ateam
2006-07-06 13:18:00 +02:00
tomas@poseidon.ndb.mysql.com
42d549a9dd
corrected results
2006-07-06 10:20:49 +02:00
ngrishakin@mysql.com
9323799bb4
ndb_dd_advance test cases
2006-07-06 04:37:03 +02:00
ngrishakin@mysql.com
58c27909e0
.del-ndb_dd_advance.result~165b282a93715547:
...
Delete: mysql-test/r/ndb_dd_advance.result
.del-ndb_dd_advance2.result~89be9fe55c2fda5a:
Delete: mysql-test/r/ndb_dd_advance2.result
.del-ndb_dd_advance2.test~e9e56bc3e8e8f740:
Delete: mysql-test/t/ndb_dd_advance2.test
.del-ndb_dd_advance.test~58e757b6c1d33996:
Delete: mysql-test/t/ndb_dd_advance.test
2006-07-05 23:50:29 +02:00
ingo@mysql.com
b21acbe089
After merge fix
2006-07-05 16:23:18 +02:00
ingo@mysql.com
5025bf32b2
Merge mysql.com:/home/mydev/mysql-4.1-bug17877
...
into mysql.com:/home/mydev/mysql-5.0-ateam
2006-07-05 11:23:21 +02:00
ingo@mysql.com
a21071d912
Merge mysql.com:/home/mydev/mysql-4.1-bug14400
...
into mysql.com:/home/mydev/mysql-5.0-ateam
2006-07-05 11:20:10 +02:00
ingo@mysql.com
20a152d5c3
Merge mysql.com:/home/mydev/mysql-4.1-bug11824
...
into mysql.com:/home/mydev/mysql-5.0-ateam
2006-07-05 11:11:40 +02:00
ngrishakin@ndb15.mysql.com
f72ec8a5fb
Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/ndbdev/ngrishakin/mysql-5.1
2006-07-05 04:48:44 +02:00
knielsen@rt.int.sifira.dk
b1c686ccca
Merge rt.int.sifira.dk:/usr/local/mysql/mysql-5.1-pristine
...
into rt.int.sifira.dk:/usr/local/mysql/tmp-5.1
2006-07-04 22:42:29 +02:00
knielsen@rt.int.sifira.dk
5ebc51cc70
Fix hardcoded /tmp path (which causes problems when running multiple
...
tests on a single machine) to use $MYSQLTEST_VARDIR/tmp instead.
2006-07-04 22:37:32 +02:00
andrey@lmy004.
2527b0f13a
fix test. this should remove the problem of
...
fix for bug#20624 events_logs_tests.test fails randomly
2006-07-04 17:30:39 +02:00
ingo@mysql.com
b2f58e94b1
After merge fix
2006-07-04 12:34:23 +02:00
ingo@mysql.com
d8546d07f8
Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
...
into mysql.com:/home/mydev/mysql-5.1-amerge
2006-07-04 10:02:11 +02:00
cmiller@zippy.(none)
267aeffca3
Renumber events to make tests pass. This must be a result of removing extraneous
...
COMMITs -- the numbers collapse to fill the gaps.
2006-07-03 23:17:53 -04:00
cmiller@zippy.(none)
5db7673f88
Removed extraneous COMMITs, from Bug#16206.
2006-07-03 19:03:47 -04:00
cmiller@zippy.(none)
8caedc5efd
Removed bdb test where the binlog format is indeterminate and updated a test
...
where it isn't. Removed a test where the merge was incorrect (and a test
duplicated.)
2006-07-03 18:29:01 -04:00
cmiller@zippy.(none)
90aa83d5e0
Additional patch from Bug#16206. BEGIN/COMMIT behavior changed 5.0 -> 5.1 .
2006-07-03 13:49:25 -04:00
cmiller@zippy.(none)
6110a83a0e
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
2006-07-03 11:35:58 -04:00
mikael@dator5.(none)
d5bb513021
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dator5.(none):/home/pappa/bug17138
2006-07-01 19:47:24 -04:00
mikael@dator5.(none)
55109a802d
Merge dator5.(none):/home/pappa/bug20583
...
into dator5.(none):/home/pappa/bug17138
2006-07-01 00:28:04 -04:00
mikael@dator5.(none)
9e56572e5c
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug20583
2006-07-01 00:22:25 -04:00
mikael@dator5.(none)
5853823bb2
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug17138
2006-07-01 00:19:23 -04:00
evgen@moonbone.local
1459784aba
Reverted wrong bug fix (Bug#11228)
2006-07-01 01:37:20 +04:00
evgen@moonbone.local
a989f7261e
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
...
into moonbone.local:/work/merge-5.1
2006-06-30 16:10:26 +04:00
monty@hasky.mysql.fi
0b00ae6bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-29 23:41:33 +03:00
tomas@poseidon.ndb.mysql.com
0d22cc662b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-29 10:48:31 +02:00
monty@narttu.mysql.fi
7b0f8635ae
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-29 00:09:53 +03:00
monty@narttu.mysql.fi
91c3e28d77
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-28 20:03:46 +03:00
evgen@moonbone.local
82369c4e65
Manual merge
2006-06-28 19:34:04 +04:00
tomas@poseidon.ndb.mysql.com
63c72dc02b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-28 17:12:18 +02:00
gkodinov@mysql.com
2cda7f5d80
4.1->5.0 merge for bug #16458
2006-06-28 15:53:54 +03:00
ingo@mysql.com
d8499f2d8f
Bug#17877 - Corrupted spatial index
...
CHECK TABLE could complain about a fully intact spatial index.
A wrong comparison operator was used for table checking.
The result was that it checked for non-matching spatial keys.
This succeeded if at least two different keys were present,
but failed if only the matching key was present.
I fixed the key comparison.
2006-06-28 14:27:37 +02:00