From: Andrei Elkin Date: February 26 2010 12:18pm Subject: bzr commit into mysql-5.1-bugteam branch (aelkin:3346) Bug#45576 List-Archive: http://lists.mysql.com/commits/101607 X-Bug: 45576 Message-Id: <201002261218.o1QCIIuq016990@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_+fZxXBtBJlQhftUWsLHUYA)" --Boundary_(ID_+fZxXBtBJlQhftUWsLHUYA) 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-26 Bug #45576 rpl_row_create_table fails on PB2 The test failed due to Bug #29790. However, logics of the failing part does not need I_S selecting. Fixing to remove the non-deterministic I_S selecting as redundant from a part of the test dealing with BUG@22864. @ mysql-test/suite/rpl/r/rpl_row_create_table.result results updated. @ mysql-test/suite/rpl/t/disabled.def rpl_row_create_table is re-enabled. @ mysql-test/suite/rpl/t/rpl_row_create_table.test removed a non-deterministic I_S selecting as redundant from a part of the test dealing with BUG@22864. 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-26 12:18:13 +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-26 12:18:13 +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-26 12:18:13 +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_+fZxXBtBJlQhftUWsLHUYA) 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: 2f555249fc6c5905c32fe2ce1c454ba82e97c227 # timestamp: 2010-02-26 14:18:18 +0200 # base_revision_id: sergey.glukhov@stripped\ # jqx19u6x387rgk7e # # Begin bundle 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 --Boundary_(ID_+fZxXBtBJlQhftUWsLHUYA)--