Commit graph

37255 commits

Author SHA1 Message Date
dli@dev3-76.dev.cn.tlan
3cf3a9211b Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-ndb-bj
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
2006-09-20 18:56:38 +08:00
lzhou/root@dev3-138.dev.cn.tlan
aa6107031b BUG#21799 manual modify variable name. 2006-09-20 10:56:37 +00:00
dli@dev3-76.dev.cn.tlan
2724451f83 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-20395
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
2006-09-20 10:25:31 +08:00
lzhou/root@dev3-138.dev.cn.tlan
6180aada88 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21799
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21799
2006-09-19 18:08:14 +00:00
lzhou/root@dev3-138.dev.cn.tlan
99395d5daf Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21799
2006-09-19 18:04:47 +00:00
gni/root@dev3-127.(none)
98941f7f18 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21530
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21530
2006-09-18 14:14:08 +08:00
gni/root@dev3-127.(none)
5bf03276bd merge exit status from 4.1 to 5.0 2006-09-18 13:28:30 +08:00
gni/root@dev3-127.(none)
6239068aa4 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-4.1/mysql-4.1-bug21530
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21530
2006-09-18 11:36:55 +08:00
gni/root@dev3-127.(none)
cdacbe3ffd BUG#21530 The ndb_mgm management client doesn't set the exit status on errors, making it
almost useless for any kind of shell script automation.
          Now add the return value that indicates the execution whether or not success 
          for many methods.
2006-09-15 20:04:59 +08:00
lzhou/root@dev3-138.dev.cn.tlan
3877c091c0 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19787
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug19787
2006-09-14 17:40:01 +00:00
lzhou/root@dev3-138.dev.cn.tlan
636368caaf BUG#21799 scan time out report temp failures 4008 2006-09-14 16:47:01 +00:00
lzhou/root@dev3-138.dev.cn.tlan
e7d5d11e5e BUG#19787 Modify correct message when some important variables are changed but cannot be applied by online 2006-09-14 14:34:06 +00:00
dli@dev3-76.dev.cn.tlan
30251ea3bc Fix for Bug #20395 Cluster datanodes always assigned to nodegroup 0 during single user mode.
Data node is not allowed to get added in the cluster when it is in single user mode.
2006-09-11 11:03:14 +08:00
gni/root@dev3-127.(none)
9438d22c12 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug21033
2006-09-05 16:07:35 +08:00
lzhou/root@dev3-138.dev.cn.tlan
dc2efd51f7 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21128
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21128
2006-09-04 18:23:32 +00:00
lzhou/root@dev3-138.dev.cn.tlan
dac797f6a0 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21128
2006-09-04 18:21:33 +00:00
lzhou/root@dev3-138.dev.cn.tlan
53a8d33b60 #BUG21128 add function of get_cluster_loglever(). 2006-09-04 18:16:12 +00:00
dli@dev3-76.dev.cn.tlan
94f34e1491 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-21345
2006-09-04 12:35:00 +08:00
dli@dev3-76.dev.cn.tlan
891a8e6ae5 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-21345
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
2006-09-04 11:25:09 +08:00
gni/root@dev3-127.(none)
1a89c4cd48 recovery 2006-09-04 09:43:47 +08:00
gni/root@dev3-127.(none)
dbd808add5 restore 2006-09-01 20:32:45 +08:00
dli@dev3-76.dev.cn.tlan
cb6d518d07 Fix for BUG#21345, Error in cluster logfile rotation.
Fixed the cluster logfile rotation code, let the cluster logfile be renamed correctly when the main logfile exceeds the configured maximum size.
2006-09-01 15:32:40 +08:00
dli@dev3-76.dev.cn.tlan
ac481a3206 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-21345
2006-09-01 10:36:32 +08:00
dli@dev3-76.dev.cn.tlan
d6600600d1 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-ndb-bj
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
2006-09-01 10:05:55 +08:00
dli@dev3-76.dev.cn.tlan
e2ff7622c5 Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-ndb-bj
2006-09-01 10:03:44 +08:00
dli@dev3-76.dev.cn.tlan
2845cf1c28 Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-bj
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-ndb-bj
2006-09-01 10:01:29 +08:00
gni/root@dev3-127.(none)
2b94b80661 BUG#21033 The error log of mysqld shows useless information, and hides the real error. 2006-08-31 18:29:23 +08:00
gni/root@dev3-127.(none)
49e96f3bc9 Merge dev3-127.(none):/mnt/mysql/home/ngb/bug19873
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19873
2006-08-29 13:43:04 +08:00
gni/root@dev3-127.(none)
0f51ee9e74 merge from ndb-5.0-ndb and ndb-5.0-ndb-bj 2006-08-29 13:31:29 +08:00
gni/root@dev3-127.(none)
169adf9533 BUG#19873 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/bug19873
2006-08-29 11:22:02 +08:00
gni/root@dev3-127.(none)
dd82086f67 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
2006-08-29 11:04:51 +08:00
gni/root@dev3-127.(none)
0a3778c085 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
2006-08-29 10:59:43 +08:00
dli@dev3-76.dev.cn.tlan
658794e44b Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/bug-21345
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
2006-08-29 10:41:07 +08:00
dli@dev3-76.dev.cn.tlan
4e7cad0fd4 Fix for bug #21345: Error in cluster logfile rotation.
Fixed the cluster logfile rotation code, let the cluster log file be renamed correctly when the main log file exceeds the configured maximum size.
2006-08-29 09:55:07 +08:00
lzhou/root@dev3-138.dev.cn.tlan
3140881459 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj
2006-08-28 16:18:48 +00:00
jonas@perch.ndb.mysql.com
f03cdb01aa Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-08-25 19:07:58 +02:00
jonas@perch.ndb.mysql.com
e4c3a58134 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-25 11:59:28 +02:00
jonas@perch.ndb.mysql.com
c6e8be9808 ndb - bug#21806
disable ndb_autodiscover3 (cluster restart (--initial))
2006-08-25 08:57:38 +02:00
jonas@perch.ndb.mysql.com
a7513025c4 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-24 20:31:54 +02:00
jonas@perch.ndb.mysql.com
392b7ea14b ndb -
disable ndb_binlog_discover as it's broken
  remove debug printout
2006-08-24 20:31:12 +02:00
jonas@perch.ndb.mysql.com
cac363e69e Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-24 15:23:46 +02:00
jonas@perch.ndb.mysql.com
74defc5737 ndb - fix monster bug in NdbEventOperation->stop where Suma sent uninitialized data
affects basically all replication tests
2006-08-24 15:22:07 +02:00
jonas@perch.ndb.mysql.com
e16c431759 ndb -
bug#21800 - 5.0 -> 5.1 merge
2006-08-24 07:25:54 +02:00
jonas@perch.ndb.mysql.com
1659927375 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-08-24 07:21:10 +02:00
jonas@perch.ndb.mysql.com
7cb75fc850 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-24 07:18:04 +02:00
jonas@perch.ndb.mysql.com
b60be73461 ndb - bug#21800
read TransactionDeadlockTimeout (for scans) to cater for insane settings
2006-08-24 07:14:46 +02:00
jonas@perch.ndb.mysql.com
e5e5d0273b Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-23 12:40:58 +02:00
jonas@perch.ndb.mysql.com
51fc14dd12 ndb - sr -
Fix so that expand_check2 is only run per fragment,
  as restore now works 1 fragment at a time (again)
2006-08-23 11:22:48 +02:00
jonas@perch.ndb.mysql.com
b1d5f861dd Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-23 11:02:27 +02:00
jonas@perch.ndb.mysql.com
4cab70171e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-08-23 11:00:29 +02:00