jonas@perch.ndb.mysql.com
ca00e63853
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-03-21 15:37:14 +01:00
jonas@perch.ndb.mysql.com
2cd7ff4e8a
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-21 15:36:23 +01:00
jonas@perch.ndb.mysql.com
8a149f2638
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-03-21 15:35:22 +01:00
svoj@june.mysql.com
9f3320e2e1
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG25908/mysql-5.1-engines
2007-03-21 17:13:19 +04:00
svoj@mysql.com/june.mysql.com
b88e7e0f97
BUG#25908 - corrupted myisam table crashes server even after repair
...
Opening certain tables that have different definitions in .MYI and
.frm may result in a server crash.
Compare .MYI and .frm definition when myisam table is opened. In case
definitions are diffirent refuse to open such table.
No test case, since it requires broken table.
2007-03-21 17:12:30 +04:00
tomas@whalegate.ndb.mysql.com
db9a44ce49
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-03-21 09:29:03 +01:00
tomas@whalegate.ndb.mysql.com
d2f8bd9ae7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-21 09:28:22 +01:00
jonas@perch.ndb.mysql.com
62fde95e08
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-03-21 09:07:55 +01:00
jonas@perch.ndb.mysql.com
762ddadc24
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-21 09:06:44 +01:00
jonas@perch.ndb.mysql.com
ec97b008f0
ndb - bug#27286
...
make sure master node is sendable, when getting ref::NotMaster
2007-03-21 08:47:54 +01:00
tomas@whalegate.ndb.mysql.com
38ac10df54
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-03-21 08:23:15 +01:00
tomas@whalegate.ndb.mysql.com
3ab996f18f
correct event buffer status reporting
2007-03-21 08:22:36 +01:00
brian@zim.(none)
9da24df4e0
Modified read buffer to see if performance difference existed.
...
Re-enabled 8gig unit test.
2007-03-20 22:13:55 -07:00
tsmith@quadxeon.mysql.com
7018d9c5aa
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
2007-03-20 21:12:46 +01:00
tsmith@quadxeon.mysql.com
2250d1a752
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
2007-03-20 21:05:48 +01:00
kent@kent-amd64.(none)
a149769b2d
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-20 17:58:30 +01:00
tomas@whalegate.ndb.mysql.com
3f16977b32
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-20 17:08:23 +01:00
tomas@whalegate.ndb.mysql.com
7bd5241cb4
enabled test case
...
+ some fixes to do the enable
2007-03-20 17:07:53 +01:00
jonas@perch.ndb.mysql.com
8c3751209c
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-20 16:36:31 +01:00
jonas@perch.ndb.mysql.com
42b3e0a5af
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-03-20 16:32:11 +01:00
iggy@recycle.(none)
ebbd5525ca
Post Merge Fix.
2007-03-20 10:22:15 -04:00
tomas@whalegate.ndb.mysql.com
64b9bda21f
BUG#24363 If the table structure has been changed, the default action about the restore will fail.
...
- correction of patch, original patch will segfault for print option
2007-03-20 11:11:08 +01:00
tomas@poseidon.
0312d1bf91
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.:/home/tomas/mysql-5.1-new-ndb
2007-03-20 08:57:34 +01:00
gni/root@dev3-221.dev.cn.tlan
61dd58beb3
BUG#21699 DROP last DATAFILE from TABLESPACE even though there are still table in it. And it gives the cofusing error message.
2007-03-20 10:36:20 +08:00
kostja@bodhi.local
bdb10baec1
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-20 00:42:11 +03:00
jonas@perch.ndb.mysql.com
925f06e511
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-03-19 18:30:06 +01:00
jonas@perch.ndb.mysql.com
229ee6d4f1
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-19 14:55:13 +01:00
jonas@perch.ndb.mysql.com
886e11736b
ndb - test_event
...
Fix compile error with gcc4
2007-03-19 14:51:17 +01:00
tomas@whalegate.ndb.mysql.com
571c869e12
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-19 12:58:17 +01:00
jonas@perch.ndb.mysql.com
6856693904
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-19 12:39:03 +01:00
tomas@whalegate.ndb.mysql.com
9b90dd9c9f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-19 12:31:33 +01:00
jonas@perch.ndb.mysql.com
09e403aa9e
ndb - bug#20185
...
Fix race in testprg...causing random TC crashes
2007-03-19 12:31:23 +01:00
tomas@poseidon.
a0bbe77c9c
Merge poseidon.:/home/tomas/mysql-5.1
...
into poseidon.:/home/tomas/mysql-5.1-new-ndb
2007-03-19 11:37:09 +01:00
jonas@perch.ndb.mysql.com
582312fd34
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-19 11:15:05 +01:00
jonas@perch.ndb.mysql.com
bdb70f7b43
ndb - autotest
...
increase some timeouts...
2007-03-19 11:13:10 +01:00
tomas@poseidon.
12fd06a6cb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.:/home/tomas/mysql-5.1-new-ndb
2007-03-19 10:54:47 +01:00
serg@janus.mylan
68fd66e853
wl#3700 - post-review fixes:
...
s/ulonglong/key_part_map/, comments
2007-03-17 00:13:25 +01:00
serg@janus.mylan
55a548cf4d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-03-16 20:33:27 +01:00
istruewing@chilla.local
02d318e4bd
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-bug26782
2007-03-16 16:44:21 +01:00
serg@janus.mylan
f813272125
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-03-16 14:09:30 +01:00
jonas@perch.ndb.mysql.com
40c3797ef0
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-03-16 11:13:01 +01:00
jonas@perch.ndb.mysql.com
a8a220534c
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-16 11:12:15 +01:00
jonas@perch.ndb.mysql.com
f161857d3e
ndb - bug#27203
...
Allow readTablePk to stumble on scan+deleted tuple,
reporting no-match instead of crash (in case scan is lock-owner)
2007-03-16 10:58:24 +01:00
istruewing@blade08.mysql.com
dba23b56e5
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25289
2007-03-16 09:17:12 +01:00
holyfoot/hf@hfmain.(none)
1d0b7020b3
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-16 11:54:36 +04:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
8d40069c3c
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-merge
2007-03-16 11:02:57 +08:00
kostja@bodhi.local
7d84ef0e11
Bug#26765 "typo when running mysql-test-run"
...
Fix a typo (togheter -> together)
2007-03-15 23:17:44 +03:00
istruewing@chilla.local
b1c5288e2e
Merge chilla.local:/home/mydev/mysql-5.0-bug25289
...
into chilla.local:/home/mydev/mysql-5.1-bug25289
2007-03-15 14:45:25 +01:00
hartmut@hartmut-desktop.buero.foebud.org
d2986bff2e
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/home/hartmut/projects/mysql/dev/bug-trees/mysql-5.1-bug25933
2007-03-15 13:52:25 +01:00
jonas@perch.ndb.mysql.com
85220e3940
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-15 13:37:04 +01:00