From aee08c3d060240308e41f2310a3f6cefa484727d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Jul 2007 11:59:05 -0400 Subject: [PATCH] WL#3915 : (NDB) master's cols > slave Changed test to enable easier debugging. mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: WL#3915 : (NDB) master's cols > slave Changes to test in order to aide debugging. mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result: WL#3915 : (NDB) master's cols > slave New result file for test changes. mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result: WL#3915 : (NDB) master's cols > slave New result file for test changes. mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result: WL#3915 : (NDB) master's cols > slave New result file for test changes. --- .../extra/rpl_tests/rpl_extraMaster_Col.test | 113 ++++++++++++++++++ .../rpl/r/rpl_extraColmaster_innodb.result | Bin 24674 -> 38226 bytes .../rpl/r/rpl_extraColmaster_myisam.result | Bin 24674 -> 38226 bytes .../rpl/r/rpl_row_extraColmaster_ndb.result | Bin 12371 -> 19129 bytes 4 files changed, 113 insertions(+) diff --git a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test index 29ff93986d5..26b1e6d5ba0 100644 --- a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test +++ b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test @@ -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', diff --git a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result index 95ef9d549c04b3e0bfbe57edb1bdaf0ccac54508..189066179255c33b7d56e0fdfd8a3893dda3535c 100644 GIT binary patch delta 602 zcmaEKfbr5QrU~!G(o7ZHeEc0l6kJ^097BCV6x5CM3=AeWT8T{VW)z$3Xe2rLwxKAK zruF6m7E9*I@!CAREH{Vx8oEH$niEhP3smb1RqH`OZ5B{%I8<#kZnYa%>l%y(6j1?nP9Fe8uDVfAUAKcsK_D045LC diff --git a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result index 5161bbc89b13bb51ae56c89224bf016163d3cc05..5bc1a13b1078a054d99dfef348ad74e85295e302 100644 GIT binary patch delta 602 zcmaEKfbr5QrU~!G(o7ZHeEc0l6kJ^097BCV6x5CM3=AeWT8T{VW)z$3Xe2rLwxKAK zruF6m7E9*I@!CAREH{Vx8oEH$niEhP3smb1RqH`OZ5B{%I8<#kZnYa%>l%y(6j1?nP9Fe8uDVfAUAKcsK_D045LC diff --git a/mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result b/mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result index 7701a83127a51f97bb0b1a5bb8820bb0c72471cd..0b1f2e6c8bf9514ef53ef326dde109d3a78bdea8 100644 GIT binary patch delta 339 zcmcbduyZQogd5^%rV4I8{*ECEF0O8lp*|rB>PC772I`X&8Pz85XVhcTwB8)XV#z!? zUz>;5CCEQOA;i(i$5o-kaN-mf4w&Z2|Jg++Gct++b?F0jnUSPR3#iKisLPThUB*CN ijzC=jBhc2WN+d~_FHlzqP*(|VT^pzD*9QQ+eqq`G delta 16 YcmdlvmGN@Igd39sl=wIMO6TYU06{(mwEzGB