diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/extra/binlog_tests/ctype_cp932.test | 4 | ||||
| -rw-r--r-- | mysql-test/r/binlog_row_blackhole.result | 12 | ||||
| -rw-r--r-- | mysql-test/r/binlog_row_mix_innodb_myisam.result | 38 | ||||
| -rwxr-xr-x | mysql-test/r/binlog_stm_ctype_cp932.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/rpl_row_charset.result | 10 | ||||
| -rw-r--r-- | mysql-test/r/rpl_row_create_table.result | 22 | ||||
| -rw-r--r-- | mysql-test/t/rpl_row_create_table.test | 8 |
7 files changed, 62 insertions, 33 deletions
diff --git a/mysql-test/extra/binlog_tests/ctype_cp932.test b/mysql-test/extra/binlog_tests/ctype_cp932.test index ac90ceabf23..6fb91e9ae50 100644 --- a/mysql-test/extra/binlog_tests/ctype_cp932.test +++ b/mysql-test/extra/binlog_tests/ctype_cp932.test @@ -434,4 +434,8 @@ insert into t1 values ('ab'); select * from t1; insert into t1 values ('abc'); select * from t1; +--disable_query_log +--disable_warnings drop table t1; +--enable_warnings +--enable_query_log diff --git a/mysql-test/r/binlog_row_blackhole.result b/mysql-test/r/binlog_row_blackhole.result index 941d208a10b..7b1e64b00d8 100644 --- a/mysql-test/r/binlog_row_blackhole.result +++ b/mysql-test/r/binlog_row_blackhole.result @@ -118,6 +118,12 @@ master-bin.000001 # Query 1 # use `test`; COMMIT master-bin.000001 # Table_map 1 # test.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Query 1 # use `test`; COMMIT +master-bin.000001 # Table_map 1 # test.t1 +master-bin.000001 # Write_rows 1 # +master-bin.000001 # Query 1 # use `test`; COMMIT +master-bin.000001 # Table_map 1 # test.t1 +master-bin.000001 # Write_rows 1 # +master-bin.000001 # Query 1 # use `test`; COMMIT master-bin.000001 # Query 1 # use `test`; create table t2 (a varchar(200)) engine=blackhole master-bin.000001 # Table_map 1 # test.t2 master-bin.000001 # Write_rows 1 # @@ -125,6 +131,12 @@ master-bin.000001 # Query 1 # use `test`; COMMIT master-bin.000001 # Query 1 # use `test`; alter table t1 add b int master-bin.000001 # Query 1 # use `test`; alter table t1 drop b master-bin.000001 # Query 1 # use `test`; create table t3 like t1 +master-bin.000001 # Table_map 1 # test.t1 +master-bin.000001 # Write_rows 1 # +master-bin.000001 # Query 1 # use `test`; COMMIT +master-bin.000001 # Table_map 1 # test.t1 +master-bin.000001 # Write_rows 1 # +master-bin.000001 # Query 1 # use `test`; COMMIT drop table t1,t2,t3; reset master; create table t1 (a int) engine=blackhole; diff --git a/mysql-test/r/binlog_row_mix_innodb_myisam.result b/mysql-test/r/binlog_row_mix_innodb_myisam.result index b444d7a3edc..4ebbec4a424 100644 --- a/mysql-test/r/binlog_row_mix_innodb_myisam.result +++ b/mysql-test/r/binlog_row_mix_innodb_myisam.result @@ -262,22 +262,26 @@ master-bin.000001 209 Write_rows 1 # master-bin.000001 243 Table_map 1 # test.t1 master-bin.000001 282 Write_rows 1 # master-bin.000001 316 Xid 1 # COMMIT /* xid= */ -master-bin.000001 343 Query 1 # use `test`; delete from t1 -master-bin.000001 420 Xid 1 # COMMIT /* xid= */ -master-bin.000001 447 Query 1 # use `test`; delete from t2 -master-bin.000001 524 Xid 1 # COMMIT /* xid= */ -master-bin.000001 551 Query 1 # use `test`; alter table t2 type=MyISAM -master-bin.000001 640 Table_map 1 # test.t1 -master-bin.000001 679 Write_rows 1 # -master-bin.000001 713 Xid 1 # COMMIT /* xid= */ -master-bin.000001 740 Table_map 1 # test.t2 -master-bin.000001 779 Write_rows 1 # -master-bin.000001 813 Query 1 # use `test`; drop table t1,t2 -master-bin.000001 892 Query 1 # use `test`; create table t0 (n int) -master-bin.000001 978 Table_map 1 # test.t0 -master-bin.000001 1017 Write_rows 1 # -master-bin.000001 1051 Table_map 1 # test.t0 -master-bin.000001 1090 Write_rows 1 # -master-bin.000001 1124 Query 1 # use `test`; create table t2 (n int) engine=innodb +master-bin.000001 343 Table_map 1 # test.t1 +master-bin.000001 382 Query 1 # use `test`; delete from t1 +master-bin.000001 459 Xid 1 # COMMIT /* xid= */ +master-bin.000001 486 Table_map 1 # test.t2 +master-bin.000001 525 Query 1 # use `test`; delete from t2 +master-bin.000001 602 Xid 1 # COMMIT /* xid= */ +master-bin.000001 629 Query 1 # use `test`; alter table t2 type=MyISAM +master-bin.000001 718 Table_map 1 # test.t1 +master-bin.000001 757 Write_rows 1 # +master-bin.000001 791 Xid 1 # COMMIT /* xid= */ +master-bin.000001 818 Query 1 # use `test`; BEGIN +master-bin.000001 886 Table_map 1 # test.t1 +master-bin.000001 925 Write_rows 1 # +master-bin.000001 954 Xid 1 # COMMIT /* xid= */ +master-bin.000001 981 Query 1 # use `test`; drop table t1,t2 +master-bin.000001 1060 Query 1 # use `test`; create table t0 (n int) +master-bin.000001 1146 Table_map 1 # test.t0 +master-bin.000001 1185 Write_rows 1 # +master-bin.000001 1219 Table_map 1 # test.t0 +master-bin.000001 1258 Write_rows 1 # +master-bin.000001 1292 Query 1 # use `test`; create table t2 (n int) engine=innodb do release_lock("lock1"); drop table t0,t2; diff --git a/mysql-test/r/binlog_stm_ctype_cp932.result b/mysql-test/r/binlog_stm_ctype_cp932.result index 470ae3b5ab2..146fb2ca2d5 100755 --- a/mysql-test/r/binlog_stm_ctype_cp932.result +++ b/mysql-test/r/binlog_stm_ctype_cp932.result @@ -11366,4 +11366,3 @@ col1 a a a -drop table t1; diff --git a/mysql-test/r/rpl_row_charset.result b/mysql-test/r/rpl_row_charset.result index 3b065a06826..4108d0c6d90 100644 --- a/mysql-test/r/rpl_row_charset.result +++ b/mysql-test/r/rpl_row_charset.result @@ -112,10 +112,16 @@ drop database mysqltest3; show binlog events from 102; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # drop database if exists mysqltest2 +master-bin.000001 # Table_map 1 # mysql.proc +master-bin.000001 # Write_rows 1 # master-bin.000001 # Query 1 # drop database if exists mysqltest3 +master-bin.000001 # Table_map 1 # mysql.proc +master-bin.000001 # Write_rows 1 # master-bin.000001 # Query 1 # create database mysqltest2 character set latin2 master-bin.000001 # Query 1 # create database mysqltest3 master-bin.000001 # Query 1 # drop database mysqltest3 +master-bin.000001 # Table_map 1 # mysql.proc +master-bin.000001 # Write_rows 1 # master-bin.000001 # Query 1 # create database mysqltest3 master-bin.000001 # Query 1 # use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100)) master-bin.000001 # Table_map 1 # mysqltest2.t1 @@ -141,7 +147,11 @@ master-bin.000001 # Query 1 # use `mysqltest2`; truncate table t1 master-bin.000001 # Table_map 1 # mysqltest2.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Query 1 # drop database mysqltest2 +master-bin.000001 # Table_map 1 # mysql.proc +master-bin.000001 # Write_rows 1 # master-bin.000001 # Query 1 # drop database mysqltest3 +master-bin.000001 # Table_map 1 # mysql.proc +master-bin.000001 # Write_rows 1 # select "--- --global--" as ""; --- --global-- diff --git a/mysql-test/r/rpl_row_create_table.result b/mysql-test/r/rpl_row_create_table.result index 9182a1d6d89..0a443d243ac 100644 --- a/mysql-test/r/rpl_row_create_table.result +++ b/mysql-test/r/rpl_row_create_table.result @@ -127,7 +127,7 @@ NULL 5 10 NULL 6 12 CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3; ERROR 23000: Duplicate entry '2' for key 1 -SHOW BINLOG EVENTS FROM 1256; +SHOW BINLOG EVENTS FROM 1326; Log_name Pos Event_type Server_id End_log_pos Info CREATE TABLE t7 (a INT, b INT UNIQUE); INSERT INTO t7 SELECT a,b FROM tt3; @@ -137,11 +137,11 @@ a b 1 2 2 4 3 6 -SHOW BINLOG EVENTS FROM 1256; +SHOW BINLOG EVENTS FROM 1326; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 1256 Query 1 1356 use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE) -master-bin.000001 1356 Table_map 1 1396 test.t7 -master-bin.000001 1396 Write_rows 1 1452 +master-bin.000001 1326 Query 1 1426 use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE) +master-bin.000001 1426 Table_map 1 1466 test.t7 +master-bin.000001 1466 Write_rows 1 1522 SELECT * FROM t7 ORDER BY a,b; a b 1 2 @@ -154,10 +154,10 @@ INSERT INTO t7 SELECT a,b FROM tt4; ROLLBACK; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back -SHOW BINLOG EVENTS FROM 1452; +SHOW BINLOG EVENTS FROM 1522; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 1452 Table_map 1 1492 test.t7 -master-bin.000001 1492 Write_rows 1 1548 +master-bin.000001 1522 Table_map 1 1562 test.t7 +master-bin.000001 1562 Write_rows 1 1618 SELECT * FROM t7 ORDER BY a,b; a b 1 2 @@ -191,10 +191,10 @@ Create Table CREATE TABLE `t9` ( `a` int(11) default NULL, `b` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -SHOW BINLOG EVENTS FROM 1548; +SHOW BINLOG EVENTS FROM 1618; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 1548 Query 1 1634 use `test`; CREATE TABLE t8 LIKE t4 -master-bin.000001 1634 Query 1 1773 use `test`; CREATE TABLE `t9` ( +master-bin.000001 1618 Query 1 1704 use `test`; CREATE TABLE t8 LIKE t4 +master-bin.000001 1704 Query 1 1843 use `test`; CREATE TABLE `t9` ( `a` int(11) default NULL, `b` int(11) default NULL ) diff --git a/mysql-test/t/rpl_row_create_table.test b/mysql-test/t/rpl_row_create_table.test index faabf489bba..52373b8278c 100644 --- a/mysql-test/t/rpl_row_create_table.test +++ b/mysql-test/t/rpl_row_create_table.test @@ -60,7 +60,7 @@ connection master; --error 1062 CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3; # Shouldn't be written to the binary log -SHOW BINLOG EVENTS FROM 1256; +SHOW BINLOG EVENTS FROM 1326; # Test that INSERT-SELECT works the same way as for SBR. CREATE TABLE t7 (a INT, b INT UNIQUE); @@ -68,7 +68,7 @@ CREATE TABLE t7 (a INT, b INT UNIQUE); INSERT INTO t7 SELECT a,b FROM tt3; SELECT * FROM t7 ORDER BY a,b; # Should be written to the binary log -SHOW BINLOG EVENTS FROM 1256; +SHOW BINLOG EVENTS FROM 1326; sync_slave_with_master; SELECT * FROM t7 ORDER BY a,b; @@ -78,7 +78,7 @@ INSERT INTO tt4 VALUES (4,8), (5,10), (6,12); BEGIN; INSERT INTO t7 SELECT a,b FROM tt4; ROLLBACK; -SHOW BINLOG EVENTS FROM 1452; +SHOW BINLOG EVENTS FROM 1522; SELECT * FROM t7 ORDER BY a,b; sync_slave_with_master; SELECT * FROM t7 ORDER BY a,b; @@ -91,7 +91,7 @@ CREATE TEMPORARY TABLE tt6 LIKE tt4; --echo **** On Master **** --query_vertical SHOW CREATE TABLE t8 --query_vertical SHOW CREATE TABLE t9 -SHOW BINLOG EVENTS FROM 1548; +SHOW BINLOG EVENTS FROM 1618; sync_slave_with_master; --echo **** On Slave **** --query_vertical SHOW CREATE TABLE t8 |