Below is the list of changes that have just been committed into a local
5.1 repository of cbell. When cbell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-07-30 11:59:05-04:00, cbell@mysql_cab_desk. +4 -0
WL#3915 : (NDB) master's cols > slave
Changed test to enable easier debugging.
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@stripped, 2007-07-30 11:58:49-04:00, cbell@mysql_cab_desk. +113 -0
WL#3915 : (NDB) master's cols > slave
Changes to test in order to aide debugging.
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@stripped, 2007-07-30 11:58:50-04:00, cbell@mysql_cab_desk. +819 -518
WL#3915 : (NDB) master's cols > slave
New result file for test changes.
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@stripped, 2007-07-30 11:58:51-04:00, cbell@mysql_cab_desk. +819 -518
WL#3915 : (NDB) master's cols > slave
New result file for test changes.
mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result@stripped, 2007-07-30 11:58:51-04:00, cbell@mysql_cab_desk. +418 -267
WL#3915 : (NDB) master's cols > slave
New result file for test changes.
diff -Nrup a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
--- a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test 2007-07-29 18:10:32 -04:00
+++ b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test 2007-07-30 11:58:49 -04:00
@@ -72,6 +72,119 @@ DROP TABLE IF EXISTS t1,t2,t3,t4,t31;
connection master;
+eval CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
+ f5 FLOAT DEFAULT '2.00')
+ ENGINE=$engine_type;
+
+sync_slave_with_master;
+alter table t1 drop f5;
+
+connection master;
+INSERT into t1 values (1, 1, 1, 'first', 1.0);
+
+ sync_slave_with_master;
+--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
+--query_vertical show slave status;
+ select * from t1 order by f3;
+
+connection master;
+DROP TABLE t1;
+eval CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
+ f5 FLOAT DEFAULT '2.00',
+ f6 CHAR(4) DEFAULT 'TEST')
+ ENGINE=$engine_type;
+
+sync_slave_with_master;
+alter table t1 drop f5, drop f6;
+
+connection master;
+INSERT into t1 values (1, 1, 1, 'first', 1.0, 'yksi');
+
+ sync_slave_with_master;
+--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
+--query_vertical show slave status;
+ select * from t1 order by f3;
+
+connection master;
+DROP TABLE t1;
+eval CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
+ f5 FLOAT DEFAULT '2.00',
+ f6 CHAR(4) DEFAULT 'TEST',
+ f7 INT DEFAULT '0')
+ ENGINE=$engine_type;
+
+sync_slave_with_master;
+alter table t1 drop f5, drop f6, drop f7;
+
+connection master;
+INSERT into t1 values (1, 1, 1, 'first', 1.0, 'yksi', 1);
+ sync_slave_with_master;
+--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
+--query_vertical show slave status;
+ select * from t1 order by f3;
+
+connection master;
+DROP TABLE t1;
+eval CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
+ f5 FLOAT DEFAULT '2.00',
+ f6 CHAR(4) DEFAULT 'TEST',
+ f7 INT DEFAULT '0',
+ f8 TEXT)
+ ENGINE=$engine_type;
+
+sync_slave_with_master;
+alter table t1 drop f5, drop f6, drop f7, drop f8;
+
+connection master;
+INSERT into t1 values (1, 1, 1, 'first', 1.0, 'yksi', 1, 'lounge of happiness');
+ sync_slave_with_master;
+--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
+--query_vertical show slave status;
+ select * from t1 order by f3;
+
+connection master;
+DROP TABLE t1;
+eval CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
+ f5 FLOAT DEFAULT '2.00',
+ f6 CHAR(4) DEFAULT 'TEST',
+ f7 INT DEFAULT '0',
+ f8 TEXT,
+ f9 LONGBLOB)
+ ENGINE=$engine_type;
+
+sync_slave_with_master;
+alter table t1 drop f5, drop f6, drop f7, drop f8, drop f9;
+
+connection master;
+INSERT into t1 values (1, 1, 1, 'first', 1.0, 'yksi', 1, 'lounge of happiness', 'very fat blob');
+ sync_slave_with_master;
+--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
+--query_vertical show slave status;
+ select * from t1 order by f3;
+
+connection master;
+DROP TABLE t1;
+eval CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
+ f5 FLOAT DEFAULT '2.00',
+ f6 CHAR(4) DEFAULT 'TEST',
+ f7 INT DEFAULT '0',
+ f8 TEXT,
+ f9 LONGBLOB,
+ f10 BIT(63))
+ ENGINE=$engine_type;
+
+sync_slave_with_master;
+alter table t1 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10;
+
+connection master;
+INSERT into t1 values (1, 1, 1, 'first', 1.0, 'yksi', 1, 'lounge of happiness', 'very fat blob', b'01010101010101');
+ sync_slave_with_master;
+--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
+--query_vertical show slave status;
+ select * from t1 order by f3;
+
+connection master;
+DROP TABLE t1;
eval CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
/* extra */
f5 FLOAT DEFAULT '2.00',
Binary files a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result and b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result differ
Binary files a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result and b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result differ
Binary files a/mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result and b/mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result differ
| Thread |
|---|
| • bk commit into 5.1 tree (cbell:1.2545) | cbell | 30 Jul |
