From: Andrei Elkin Date: February 19 2010 3:03pm Subject: bzr commit into mysql-5.1-bugteam branch (aelkin:3346) Bug#45576 List-Archive: http://lists.mysql.com/commits/100883 X-Bug: 45576 Message-Id: <201002191503.o1JF3m2W027391@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_eaW32LggOl1iwpTYQZc1iw)" --Boundary_(ID_eaW32LggOl1iwpTYQZc1iw) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline #At file:///home/andrei/MySQL/BZR/FIXES/5.1-bt-bug45576-row_create_table-fails/ based on revid:sergey.glukhov@stripped 3346 Andrei Elkin 2010-02-19 bug#45576 a small cleanup for the test modified: mysql-test/suite/rpl/r/rpl_row_create_table.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_row_create_table.test === modified file 'mysql-test/suite/rpl/r/rpl_row_create_table.result' --- a/mysql-test/suite/rpl/r/rpl_row_create_table.result 2009-11-27 13:34:39 +0000 +++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result 2010-02-19 15:03:44 +0000 @@ -241,10 +241,12 @@ STOP SLAVE; SET GLOBAL storage_engine=@storage_engine; START SLAVE; ================ BUG#22864 ================ -STOP SLAVE; -RESET SLAVE; -RESET MASTER; -START SLAVE; +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; SET AUTOCOMMIT=0; CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (1),(2),(3); @@ -264,15 +266,6 @@ t1 t2 t3 t4 -SELECT TABLE_NAME,ENGINE -FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_NAME LIKE 't_' -ORDER BY TABLE_NAME; -TABLE_NAME ENGINE -t1 MyISAM -t2 InnoDB -t3 InnoDB -t4 InnoDB SELECT * FROM t1 ORDER BY a; a 1 @@ -334,15 +327,6 @@ t1 t2 t3 t4 -SELECT TABLE_NAME,ENGINE -FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_NAME LIKE 't_' -ORDER BY TABLE_NAME; -TABLE_NAME ENGINE -t1 MyISAM -t2 InnoDB -t3 InnoDB -t4 InnoDB SELECT * FROM t1 ORDER BY a; a 1 === modified file 'mysql-test/suite/rpl/t/disabled.def' --- a/mysql-test/suite/rpl/t/disabled.def 2009-12-01 09:21:15 +0000 +++ b/mysql-test/suite/rpl/t/disabled.def 2010-02-19 15:03:44 +0000 @@ -9,5 +9,3 @@ # Do not use any TAB characters for whitespace. # ############################################################################## - -rpl_row_create_table : Bug#45576 2009-12-01 joro rpl_row_create_table fails on PB2 === modified file 'mysql-test/suite/rpl/t/rpl_row_create_table.test' --- a/mysql-test/suite/rpl/t/rpl_row_create_table.test 2009-11-27 13:34:39 +0000 +++ b/mysql-test/suite/rpl/t/rpl_row_create_table.test 2010-02-19 15:03:44 +0000 @@ -136,13 +136,9 @@ START SLAVE; # BUG#22864 (Rollback following CREATE ... SELECT discards 'CREATE # table' from log): --echo ================ BUG#22864 ================ -connection slave; -STOP SLAVE; -RESET SLAVE; -connection master; -RESET MASTER; -connection slave; -START SLAVE; + +--source include/master-slave-reset.inc + connection master; SET AUTOCOMMIT=0; CREATE TABLE t1 (a INT); @@ -160,10 +156,6 @@ INSERT INTO t1 VALUES (4),(5),(6); ROLLBACK; SHOW TABLES; -SELECT TABLE_NAME,ENGINE - FROM INFORMATION_SCHEMA.TABLES - WHERE TABLE_NAME LIKE 't_' -ORDER BY TABLE_NAME; SELECT * FROM t1 ORDER BY a; SELECT * FROM t2 ORDER BY a; SELECT * FROM t3 ORDER BY a; @@ -173,10 +165,6 @@ SELECT * FROM t4 ORDER BY a; SHOW BINLOG EVENTS FROM 106; sync_slave_with_master; SHOW TABLES; -SELECT TABLE_NAME,ENGINE - FROM INFORMATION_SCHEMA.TABLES - WHERE TABLE_NAME LIKE 't_' -ORDER BY TABLE_NAME; SELECT * FROM t1 ORDER BY a; SELECT * FROM t2 ORDER BY a; SELECT * FROM t3 ORDER BY a; --Boundary_(ID_eaW32LggOl1iwpTYQZc1iw) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/aelkin@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/aelkin@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: aelkin@stripped # target_branch: file:///home/andrei/MySQL/BZR/FIXES/5.1-bt-bug45576-\ # row_create_table-fails/ # testament_sha1: 2df6188ffbca2e63e293fcb94141436f14daf748 # timestamp: 2010-02-19 17:03:48 +0200 # base_revision_id: sergey.glukhov@stripped\ # jqx19u6x387rgk7e # # Begin bundle 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 qDnxHFFAyBIvF3JFOFCQRsUfCQ== --Boundary_(ID_eaW32LggOl1iwpTYQZc1iw)--