Commit graph

44875 commits

Author SHA1 Message Date
Justin.He/justin.he@dev3-240.dev.cn.tlan
fdf57c7ac2 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/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-04-05 10:47:40 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
888c2057e9 sync the initialization configuration information between ConfigInfo.cpp and ParamInfo.cpp 2007-04-04 19:30:43 +08:00
gni/root@dev3-221.dev.cn.tlan
888fcd6f7e recovery from 5.0 merge for bug18676 2007-04-04 15:22:37 +08:00
gni/root@dev3-221.dev.cn.tlan
99895eb6c3 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug18676
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
2007-04-04 14:30:12 +08:00
tomas@whalegate.ndb.mysql.com
49d2135c72 Bug#17095 Cluster RBR in circle does not terminate
- set correct server id
2007-04-03 17:36:05 +02:00
tomas@whalegate.ndb.mysql.com
6e7df50749 Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data
- insert gap event on cluster connect
2007-04-03 14:49:57 +02:00
tomas@whalegate.ndb.mysql.com
6db3dbcaca Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data
- insert gap event on cluster connect
2007-04-03 14:31:46 +02:00
tomas@whalegate.ndb.mysql.com
81ac116dfa Bug #17095 Cluster RBR in circle does not terminate
- add any value to ndb
- use it to update correct server id in binlog thread
2007-04-03 12:57:18 +02:00
gni/root@dev3-221.dev.cn.tlan
98e5757618 BUG#18676 when cluster storage engine is down, misleading error message on create table with 4009. 2007-04-03 18:44:29 +08:00
gni/root@dev3-221.dev.cn.tlan
e1971cfa51 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699
2007-04-03 18:05:10 +08:00
gni/root@dev3-221.dev.cn.tlan
96c37edd5c Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699
2007-04-03 18:01:43 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c8d0b6fc89 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
2007-04-03 17:07:00 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
85c0d0554c 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/bug24521-5.1-new-ndb-bj
2007-04-03 17:03:12 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
0a29b7e7e3 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25295-5.1-new-ndb-bj
2007-04-03 16:48:21 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ac4467e6c2 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/bug25295-5.1-new-ndb-bj
2007-04-03 16:45:47 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7b6216f4e Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25875-5.1-new-ndb-bj
2007-04-03 16:43:24 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
cd1919321a Bug#25875, Newly created table through CREATE TABLE .. LIKE has no ndb_dd attributes 2007-04-03 16:40:16 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ce52a7bdc3 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug26898-5.1-new-ndb-bj
2007-04-03 16:30:57 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7382b88fd 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/bug26898-5.1-new-ndb-bj
2007-04-03 16:27:51 +08:00
tomas@whalegate.ndb.mysql.com
d2bcd58e5b Bug #26783 replication status unknown after cluster or mysqld failure
- correction, wrong datatype used
2007-04-03 09:53:15 +02:00
tomas@whalegate.ndb.mysql.com
7e9df0e9b6 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-04-03 09:37:15 +02:00
tomas@whalegate.ndb.mysql.com
d019e94aed remove unused List 2007-04-03 09:30:05 +02:00
tomas@whalegate.ndb.mysql.com
2dc02167df Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-03 07:21:42 +02:00
tomas@whalegate.ndb.mysql.com
8bf9bf001d Bug #26783 replication status unknown after cluster or mysqld failure
- update the ndb_apply_status table with binlog info
2007-04-03 07:20:55 +02:00
tomas@whalegate.ndb.mysql.com
aa7d01bca4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-02 22:24:04 +02:00
tomas@whalegate.ndb.mysql.com
e372d0419a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-02 21:27:17 +02:00
tomas@whalegate.ndb.mysql.com
33680fa2f7 correction of manual merge 2007-04-02 21:26:27 +02:00
tomas@whalegate.ndb.mysql.com
47d224aac3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-02 18:54:29 +02:00
tomas@whalegate.ndb.mysql.com
f2437037f3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-02 18:51:45 +02:00
tomas@whalegate.ndb.mysql.com
0accd5f242 corrected previos manual merge 2007-04-02 18:49:52 +02:00
tomas@whalegate.ndb.mysql.com
661453619e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-04-02 18:39:40 +02:00
tomas@whalegate.ndb.mysql.com
fb87082d32 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-02 18:28:42 +02:00
tomas@whalegate.ndb.mysql.com
c02efd8f1b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-02 18:22:33 +02:00
tomas@whalegate.ndb.mysql.com
dd6073f5d7 BUG#27560: Memory usage of mysqld grows while doing nothing
The query-cache watch thread was continually allocating new thread entries on the
THD MEM_ROOT, not freed until server exit.
  
Fixed by using a simple array, auto-expanded as necessary.
2007-04-02 18:21:05 +02:00
jonas@perch.ndb.mysql.com
2a29f0affe Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-04-02 09:45:58 +02:00
jonas@perch.ndb.mysql.com
fbcfa4be3d 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-04-02 09:34:33 +02:00
jonas@perch.ndb.mysql.com
6f12c538c4 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-04-02 09:30:35 +02:00
jonas@perch.ndb.mysql.com
27902d6507 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-04-02 09:29:11 +02:00
jonas@perch.ndb.mysql.com
6f4b908b34 ndb - bug#27581
make sure not to leave partially initialized pagerage-records
2007-04-02 09:07:15 +02:00
jonas@perch.ndb.mysql.com
48e890be45 fix atrt mysql_install_db, make sure no extra my.cnf is read 2007-04-02 08:39:58 +02:00
jonas@perch.ndb.mysql.com
c77ffe4a26 ndb - fix bug in my.cnf config handling
put64 for 64-bit variables
2007-04-02 08:36:00 +02:00
ibabaev@bk-internal.mysql.com
8b8a61d77a Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-04-02 03:53:21 +02:00
igor@olga.mysql.com
5534f099f1 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/mysql-5.1-opt
2007-04-01 14:00:56 -07:00
lars/lthalmann@dl145k.mysql.com
048502086d Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-04-01 01:49:16 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
572c034485 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-04-01 01:48:21 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c32c54881e Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-04-01 01:46:38 +02:00
tomas@whalegate.ndb.mysql.com
fc6a077cc7 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-31 21:53:02 +02:00
lars/lthalmann@dl145k.mysql.com
579cee7f49 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-03-31 20:07:44 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
b7537e2ac4 New test case shows valgrind failure (disabling this
new test case until the valgrind failure is fixed, 
reported in bug 27564)
2007-03-31 19:49:05 +02:00
mats@romeo.(none)
bd86c0f459 Fix to rpl_row_create_table test. 2007-03-31 19:10:25 +02:00