diff options
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result | 53 |
1 files changed, 41 insertions, 12 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result index 544bfa50034..d7bc9dd54d6 100644 --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result @@ -1,9 +1,12 @@ include/master-slave.inc [connection master] +connection master; +connection slave; STOP SLAVE; SET @my_sql_mode= @@global.sql_mode; SET GLOBAL SQL_MODE='STRICT_ALL_TABLES'; START SLAVE; +connection master; CREATE TABLE t1_int (a INT PRIMARY KEY, b INT) ENGINE='InnoDB'; CREATE TABLE t1_bit (a INT PRIMARY KEY, b INT) ENGINE='InnoDB'; CREATE TABLE t1_char (a INT PRIMARY KEY, b INT) ENGINE='InnoDB'; @@ -16,6 +19,7 @@ CREATE TABLE t6 (a INT, b INT, c INT) ENGINE='InnoDB'; CREATE TABLE t7 (a INT NOT NULL) ENGINE='InnoDB'; CREATE TABLE t8 (a INT NOT NULL) ENGINE='InnoDB'; CREATE TABLE t9 (a INT) ENGINE='InnoDB'; +connection slave; ALTER TABLE t1_int ADD x INT DEFAULT 42; ALTER TABLE t1_bit ADD x BIT(3) DEFAULT b'011', @@ -37,7 +41,7 @@ set @@global.slave_exec_mode= 'IDEMPOTENT'; INSERT INTO t1_int VALUES (2, 4, 4711); INSERT INTO t1_char VALUES (2, 4, 'Foo is a bar'); INSERT INTO t1_bit VALUES (2, 4, b'101', b'11100', b'01'); -**** On Master **** +connection master; INSERT INTO t1_int VALUES (1,2); INSERT INTO t1_int VALUES (2,5); INSERT INTO t1_bit VALUES (1,2); @@ -56,7 +60,7 @@ SELECT * FROM t1_char ORDER BY a; a b 1 2 2 5 -**** On Slave **** +connection slave; set @@global.slave_exec_mode= default; SELECT a,b,x FROM t1_int ORDER BY a; a b x @@ -70,7 +74,7 @@ SELECT a,b,x FROM t1_char ORDER BY a; a b x 1 2 Just a test 2 5 Foo is a bar -**** On Master **** +connection master; UPDATE t1_int SET b=2*b WHERE a=2; UPDATE t1_char SET b=2*b WHERE a=2; UPDATE t1_bit SET b=2*b WHERE a=2; @@ -86,7 +90,7 @@ SELECT * FROM t1_char ORDER BY a; a b 1 2 2 10 -**** On Slave **** +connection slave; SELECT a,b,x FROM t1_int ORDER BY a; a b x 1 2 42 @@ -99,38 +103,59 @@ SELECT a,b,x FROM t1_char ORDER BY a; a b x 1 2 Just a test 2 10 Foo is a bar +connection master; INSERT INTO t9 VALUES (2); +connection slave; +connection master; INSERT INTO t1_nodef VALUES (1,2); +connection slave; select count(*) from t1_nodef; count(*) 1 +connection master; INSERT INTO t9 VALUES (2); -**** On Master **** +connection slave; +connection master; INSERT INTO t2 VALUES (2,4); SELECT * FROM t2; a b 2 4 -**** On Slave **** +connection slave; SELECT * FROM t2; a 2 include/check_slave_is_running.inc +connection master; INSERT INTO t9 VALUES (4); +connection slave; +connection master; INSERT INTO t4 VALUES (4); +connection slave; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column [012] type mismatch.* error.* 1535"); call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]. cannot be converted from type.* error.* 1677"); include/wait_for_slave_sql_error_and_skip.inc [errno=1677] Last_SQL_Error = 'Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float'' +connection master; INSERT INTO t9 VALUES (5); +connection slave; +connection master; INSERT INTO t5 VALUES (5,10,25); +connection slave; include/wait_for_slave_sql_error_and_skip.inc [errno=1677] Last_SQL_Error = 'Column 1 of table 'test.t5' cannot be converted from type 'int' to type 'float'' +connection master; INSERT INTO t9 VALUES (6); +connection slave; +connection master; INSERT INTO t6 VALUES (6,12,36); +connection slave; include/wait_for_slave_sql_error_and_skip.inc [errno=1677] Last_SQL_Error = 'Column 2 of table 'test.t6' cannot be converted from type 'int' to type 'float'' +connection master; INSERT INTO t9 VALUES (6); +connection slave; include/check_slave_is_running.inc +connection master; INSERT INTO t7 VALUES (1),(2),(3); INSERT INTO t8 VALUES (1),(2),(3); SELECT * FROM t7 ORDER BY a; @@ -143,6 +168,7 @@ a 1 2 3 +connection slave; SELECT * FROM t7 ORDER BY a; a e1 e2 e3 e4 e5 e6 e7 e8 1 NULL NULL NULL NULL NULL NULL NULL NULL @@ -153,37 +179,40 @@ a e1 e2 e3 e4 e5 e6 e7 e8 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 -**** On Master **** +connection master; TRUNCATE t1_nodef; SET SQL_LOG_BIN=0; INSERT INTO t1_nodef VALUES (1,2); INSERT INTO t1_nodef VALUES (2,4); SET SQL_LOG_BIN=1; -**** On Slave **** +connection slave; +connection slave; INSERT INTO t1_nodef VALUES (1,2,3,4,5); INSERT INTO t1_nodef VALUES (2,4,6,8,10); -**** On Master **** +connection master; UPDATE t1_nodef SET b=2*b WHERE a=1; SELECT * FROM t1_nodef ORDER BY a; a b 1 4 2 4 -**** On Slave **** +connection slave; SELECT * FROM t1_nodef ORDER BY a; a b x y z 1 4 3 4 5 2 4 6 8 10 -**** On Master **** +connection master; DELETE FROM t1_nodef WHERE a=2; SELECT * FROM t1_nodef ORDER BY a; a b 1 4 -**** On Slave **** +connection slave; SELECT * FROM t1_nodef ORDER BY a; a b x y z 1 4 3 4 5 **** Cleanup **** +connection master; DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef; DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t7,t8,t9; +connection slave; SET @@global.sql_mode= @my_sql_mode; include/rpl_end.inc |