lzhou/zhl@dev3-63.(none)
439202bd9b
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354
2007-03-30 13:30:58 +00:00
lzhou/zhl@dev3-63.(none)
984f807f5c
Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354
2007-03-30 11:02:36 +00:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
a9464595ea
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25446-5.1-new-ndb-bj
2007-03-30 11:03:44 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
bb1df27c89
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25446-5.1-new-ndb-bj
2007-03-30 10:59:10 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
cf21cf2c73
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj
2007-03-28 11:11:11 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
cf64eb21c3
Bug#25446, START BACKUP NOWAIT Reports error and then continues
2007-03-22 15:54:41 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
0bbae24750
Bug#27127, Incorrect behaviour of timestamp column with DEFAULT CURRENT_TIMESTAMP
...
correct the bitmap_set_bit when a field is timestamp and described
with default CURRENT_TIMESTAMP or on update CURRENT_TIMESTAMP,
then it will reduce a little time cost when the field doesnot need
to write.
2007-03-22 12:16:52 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
bd9dd63be5
Bug#24568, NdbScanFilter NAND/NOR operations sometimes do not works as expected
...
this patch is an absolutely necessary supplement of the previous patch,
the previous patch doesnot cover isnull() and isnotnull() methods' effect.
2007-03-21 15:36:22 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
72f91a02e7
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj-merge
2007-03-16 12:23:31 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
1bcac85f04
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
2007-03-14 18:48:51 +08:00
jonas@perch.ndb.mysql.com
f2465cf677
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-14 11:23:58 +01:00
jonas@perch.ndb.mysql.com
820901f928
ndb - bug#27087
...
Make sure not to handle API_FAILREQ if it's already handled
2007-03-14 11:22:11 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
9b77ac20a5
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-03-14 10:16:24 +08:00
jonas@perch.ndb.mysql.com
ac52f24ece
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-13 21:04:28 +01:00
jonas@perch.ndb.mysql.com
5ea42fb2ea
ndb - bug#27102
...
Make sure head after undo execute does not point to last page of file
As this will confuse next write to group
2007-03-13 21:03:34 +01:00
jonas@perch.ndb.mysql.com
023ce289b6
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-13 13:56:51 +01:00
jonas@perch.ndb.mysql.com
4a27e9adb9
ndb - bug#27003
...
merge to 5.1, adopt testprg to optimized node recovery
2007-03-13 12:38:47 +01:00
jonas@perch.ndb.mysql.com
620731060f
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-03-13 12:07:33 +01:00
jonas@perch.ndb.mysql.com
e2853bddbc
ndb - bug#27003
...
Handle random(not in order) LQHKEYREQ failures during node-restart
2007-03-13 11:29:14 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
8b049838bf
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb.test
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.test
2007-03-13 18:18:17 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
2af8906b31
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25877-5.1-new-ndb-bj
2007-03-13 18:13:07 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c32b4084ec
BUG#25880, Adding new column to ndb_dd table moves data for non_indexed fields in memory
...
correct the inconsistency between columns' storage type with table's storage_media & tablespace
2007-03-13 18:13:06 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
322ba30741
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25877-5.1-new-ndb-bj
2007-03-13 18:13:05 +08:00
lzhou/zhl@dev3-63.(none)
9fb5e5d08b
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug26307
2007-03-13 10:13:04 +00:00
knielsen@ymer.(none)
2e43ab09cb
Merge ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
...
into ymer.(none):/usr/local/mysql/mysql-5.0-ndb
2007-03-12 10:18:34 +01:00
knielsen@ymer.(none)
4fe26832e4
Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb
...
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-03-12 08:42:59 +01:00
tomas@poseidon.mysql.com
1debcc5512
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-10 11:57:10 +07:00
tomas@poseidon.mysql.com
1b872243ab
Merge poseidon.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-10 11:49:08 +07:00
tomas@poseidon.mysql.com
52b975a1c8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into poseidon.mysql.com:/home/tomas/mysql-5.0
2007-03-10 11:49:04 +07:00
tomas@poseidon.mysql.com
9ef9bfddd4
disabling _new_ unstable test case
2007-03-10 11:46:20 +07:00
knielsen@ymer.(none)
24a816e813
BUG#27018: Partial blob write inside blob clobbers data after the write.
...
When doing partial blob update with NdbBlob::writeData(), zero-padding
after the write was wrongly done, causing part of the old blob value
to be overwritten with zeros (or spaces for text field).
Fixed by only padding when needed (when writing at end of the blob).
2007-03-09 23:37:33 +01:00
mjorgensen@production.mysql.com
0b769c25aa
Merge bk-internal:/home/bk/mysql-5.1-build
...
into production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build
2007-03-09 23:20:50 +01:00
mjorgensen@production.mysql.com
6be30eec86
Merge bk-internal:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.0-build
2007-03-09 23:01:12 +01:00
tomas@poseidon.mysql.com
58d0267bb5
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 21:02:52 +07:00
tomas@poseidon.mysql.com
1a07a15cb6
corrected returned error code
2007-03-09 21:01:19 +07:00
tomas@poseidon.mysql.com
0189afa7e0
Merge poseidon.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 20:55:37 +07:00
tomas@poseidon.mysql.com
175a7e9e86
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 20:44:44 +07:00
tomas@poseidon.mysql.com
6cb0c79c06
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
...
into poseidon.mysql.com:/home/tomas/mysql-5.0
2007-03-09 20:39:59 +07:00
tomas@poseidon.mysql.com
6f5ac3c03a
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-03-09 20:38:10 +07:00
tomas@poseidon.mysql.com
e28ea98aab
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
2007-03-09 20:36:04 +07:00
tomas@poseidon.mysql.com
839f582969
added error code for failing send signal and timeout waiting for node failure
...
added error code for failing send signal and timeout waiting for node failure
2007-03-09 20:34:00 +07:00
tomas@poseidon.mysql.com
a8cd78dd05
Bug #26825 MySQL Server Crashes in high load
...
Bug #26997 mysqld segfault when in single user mode
2007-03-09 20:29:46 +07:00
holyfoot/hf@hfmain.(none)
eca8b1a62d
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-09 16:51:32 +04:00
holyfoot/hf@hfmain.(none)
71e6d69647
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-09 16:37:36 +04:00
tomas@poseidon.mysql.com
04b34ebaf7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 18:29:26 +07:00
tomas@poseidon.mysql.com
a8685e134e
Merge poseidon.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 18:14:57 +07:00
tomas@poseidon.mysql.com
7e32a4b86b
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 18:10:55 +07:00
jonas@perch.ndb.mysql.com
5a6952b8c5
Merge perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.0-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.1-telco-gca
2007-03-09 11:50:32 +01:00
igor@olga.mysql.com
e10d74cff9
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-03-09 02:45:17 -08:00
tomas@poseidon.mysql.com
0a6f51075a
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
...
into poseidon.mysql.com:/home/tomas/mysql-5.0
2007-03-09 17:28:38 +07:00