Commit graph

765 commits

Author SHA1 Message Date
gni/root@dev3-127.(none)
c26952192b BUG@21585 The --help option shows a screen of command options for the ndbd, ndb_mgmd, ndb_mgm
and other commands related to ndb. For all of these, the help screen contains 
           "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.
2006-09-22 20:22:50 +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
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
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
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)
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
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
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
pekka@orca.ndb.mysql.com
4828d63cda Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21017
2006-08-22 15:00:42 +02:00
pekka@orca.ndb.mysql.com
b97a4b7f44 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-08-22 10:24:58 +02:00
jonas@perch.ndb.mysql.com
a1ea21bf26 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-22 09:49:28 +02:00
jonas@perch.ndb.mysql.com
e0f7590e7c ndb -
fix incorrect assertion in dbacc
2006-08-22 09:45:35 +02:00
pekka@orca.ndb.mysql.com
e7508ad397 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug21017
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21017
2006-08-21 23:45:02 +02:00
kent@mysql.com/g4-2.local
b329f2c3ef Many files:
Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb
2006-08-21 15:34:29 +02:00
jonas@perch.ndb.mysql.com
c7a78551c6 ndb - bug#16310
better error message for creating table with non-existing tablespace
2006-08-21 14:09:50 +02:00
jonas@perch.ndb.mysql.com
41c876c3f2 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-21 09:48:48 +02:00
jonas@perch.ndb.mysql.com
8ea0b13306 ndb - bug#21710
fix bug in drop_file during pageout (LCP)
2006-08-21 09:26:52 +02:00
jonas@perch.ndb.mysql.com
560fc3e3b3 Merge perch.ndb.mysql.com:/home/jonas/src/51-clean
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-17 19:49:00 +02:00
jonas@perch.ndb.mysql.com
ed1e0b087c 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-17 15:23:13 +02:00
jonas@perch.ndb.mysql.com
7e9b2ef964 ndb - pb random failures
Fix bug in lcp during drop table
  Make sure that file thread is not started until meta data has completed
2006-08-17 15:18:06 +02:00
gni/root@dev3-127.(none)
4c088a2905 Merge dev3-127.(none):/mnt/mysql/home/ngb/bug19620
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19620
2006-08-16 17:48:50 +08:00
gni/root@dev3-127.(none)
762716053f Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19620
2006-08-16 17:46:40 +08:00
lzhou/root@dev3-138.dev.cn.tlan
8905e7b744 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-bj
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052
2006-08-16 09:46:38 +00:00
stewart@willster.(none)
7cc53b0eb8 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2006-08-16 15:33:54 +08:00
gni/root@dev3-127.(none)
47f3faa3ab Merge dev3-127.(none):/mnt/mysql/home/ngb/bug19620
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19620
2006-08-16 10:37:34 +08:00
lzhou/root@dev3-138.dev.cn.tlan
ef88569043 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052
2006-08-15 19:32:35 +00:00
lzhou/root@dev3-138.dev.cn.tlan
07918701f0 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/mysql-5.1-ndb-bj
2006-08-15 18:15:20 +00:00
mskold/marty@linux.site
604f3f8a69 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-08-15 14:39:48 +02:00
dli/root@dev3-76.dev.cn.tlan
a9685cd6ee Merge dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.0/mysql-5.0-bug19047
into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.1/mysql-5.1-bug19047
2006-08-15 20:31:23 +08:00
dli/root@dev3-76.dev.cn.tlan
46ec87e2fe Merge dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.0/mysql-5.0-ndb-bj
into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.1/mysql-5.1-ndb-bj
2006-08-15 19:19:27 +08:00
stewart@willster.(none)
34d0ac1797 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2006-08-15 15:47:03 +08:00
jonas@perch.ndb.mysql.com
10ff2f9564 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-15 08:49:38 +02:00
jonas@perch.ndb.mysql.com
47d971621b ndb -
Fix ndb_condition_pushdown (5.0->5.1 merge error)
2006-08-15 08:47:49 +02:00
jonas@perch.ndb.mysql.com
7a95208ca0 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-15 08:17:43 +02:00
jonas@perch.ndb.mysql.com
2ad21cf976 ndb - bug#21172
Fix build failure if O_DIRECT is not defined
  Fix stack overflow by making odirect_readbuf global
  Remove soem old debug variables
2006-08-15 07:52:27 +02:00
stewart@willster.(none)
8089a11cbb Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2006-08-15 11:49:40 +08:00
stewart@willster.(none)
0d7beacf31 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2006-08-15 11:28:27 +08:00
jonas@perch.ndb.mysql.com
d3855ce67c ndb - bug#21213
5.1-fix adopt to changes in node recovery
2006-08-14 15:54:21 +02:00
jonas@perch.ndb.mysql.com
3b050ed422 merge 2006-08-14 14:52:45 +02:00
jonas@perch.ndb.mysql.com
73c58c3234 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-08-14 14:11:51 +02:00
jonas@perch.ndb.mysql.com
f6f5f475ea Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-08-14 13:59:25 +02:00
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
jonas@perch.ndb.mysql.com
5bb4e84a72 ndb - bug#21172
Handle also open && !OM_INIT wrt non function O_DIRECT
2006-08-10 16:12:54 +02:00