From: Patrick Crews Date: September 12 2008 1:51am Subject: bzr commit into mysql-6.0 branch (patrick.crews:2830) Bug#38903 List-Archive: http://lists.mysql.com/commits/53910 X-Bug: 38903 Message-Id: <20080912015150.EF0621F0211F@mister-local.local> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///Users/pcrews/usr/local/bin/data1/work/rpl_big/mysql-6.0-merge/ 2830 Patrick Crews 2008-09-11 [merge] Bug#38903 Test rpl.rpl_truncate_7ndb_2 failing Upmerge from 5.1-bugteam Fixed bad path in .test file Moved test from rpl to rpl_ndb suite (per conversation with Cluster QA) Re-recorded .result file to match rpl_truncate_7ndb.result added: mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test renamed: mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt === added file 'mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result' --- a/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result 2008-09-12 01:51:01 +0000 @@ -0,0 +1,91 @@ +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; +**** On Master **** +CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB; +INSERT INTO t1 VALUES (1,1), (2,2); +SELECT * FROM t1 ORDER BY a,b; +a b +1 1 +2 2 +**** On Slave **** +INSERT INTO t1 VALUE (3,3); +SELECT * FROM t1 ORDER BY a,b; +a b +1 1 +2 2 +3 3 +**** On Master **** +TRUNCATE TABLE t1; +SELECT * FROM t1 ORDER BY a,b; +a b +**** On Slave **** +SELECT * FROM t1 ORDER BY a,b; +a b +**** On Master **** +DROP TABLE t1; +SHOW BINLOG EVENTS; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 107 Server ver: SERVER_VERSION, Binlog ver: 4 +master-bin.000001 107 Query 1 224 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB +master-bin.000001 224 Query 1 288 BEGIN +master-bin.000001 288 Table_map 1 331 table_id: # (test.t1) +master-bin.000001 331 Table_map 1 393 table_id: # (mysql.ndb_apply_status) +master-bin.000001 393 Write_rows 1 452 table_id: # +master-bin.000001 452 Write_rows 1 499 table_id: # flags: STMT_END_F +master-bin.000001 499 Query 1 564 COMMIT +master-bin.000001 564 Query 1 644 use `test`; TRUNCATE TABLE t1 +master-bin.000001 644 Query 1 720 use `test`; DROP TABLE t1 +**** On Master **** +CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB; +INSERT INTO t1 VALUES (1,1), (2,2); +SELECT * FROM t1 ORDER BY a,b; +a b +1 1 +2 2 +**** On Slave **** +INSERT INTO t1 VALUE (3,3); +SELECT * FROM t1 ORDER BY a,b; +a b +1 1 +2 2 +3 3 +**** On Master **** +DELETE FROM t1; +SELECT * FROM t1 ORDER BY a,b; +a b +**** On Slave **** +SELECT * FROM t1 ORDER BY a,b; +a b +3 3 +**** On Master **** +DROP TABLE t1; +SHOW BINLOG EVENTS; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 107 Server ver: SERVER_VERSION, Binlog ver: 4 +master-bin.000001 107 Query 1 224 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB +master-bin.000001 224 Query 1 288 BEGIN +master-bin.000001 288 Table_map 1 331 table_id: # (test.t1) +master-bin.000001 331 Table_map 1 393 table_id: # (mysql.ndb_apply_status) +master-bin.000001 393 Write_rows 1 452 table_id: # +master-bin.000001 452 Write_rows 1 499 table_id: # flags: STMT_END_F +master-bin.000001 499 Query 1 564 COMMIT +master-bin.000001 564 Query 1 644 use `test`; TRUNCATE TABLE t1 +master-bin.000001 644 Query 1 720 use `test`; DROP TABLE t1 +master-bin.000001 720 Query 1 837 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB +master-bin.000001 837 Query 1 901 BEGIN +master-bin.000001 901 Table_map 1 944 table_id: # (test.t1) +master-bin.000001 944 Table_map 1 1006 table_id: # (mysql.ndb_apply_status) +master-bin.000001 1006 Write_rows 1 1065 table_id: # +master-bin.000001 1065 Write_rows 1 1112 table_id: # flags: STMT_END_F +master-bin.000001 1112 Query 1 1177 COMMIT +master-bin.000001 1177 Query 1 1241 BEGIN +master-bin.000001 1241 Table_map 1 1284 table_id: # (test.t1) +master-bin.000001 1284 Table_map 1 1346 table_id: # (mysql.ndb_apply_status) +master-bin.000001 1346 Write_rows 1 1405 table_id: # +master-bin.000001 1405 Delete_rows 1 1444 table_id: # flags: STMT_END_F +master-bin.000001 1444 Query 1 1509 COMMIT +master-bin.000001 1509 Query 1 1585 use `test`; DROP TABLE t1 === renamed file 'mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt' => 'mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt' === added file 'mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test' --- a/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test 2008-09-12 01:51:01 +0000 @@ -0,0 +1,11 @@ +# Same test as rpl_truncate_7ndb.test, but with mixed mode +# This is marked with 'big_test' just because the rpl_truncate_7ndb test is +# so slow... + +# Last Change: 2008-09-03 +# Change Author: pcrews +# Change: Moved test to rpl_ndb suite, updated location of --source .test file + +--source include/have_binlog_format_mixed.inc +--source include/big_test.inc +--source suite/rpl_ndb/t/rpl_truncate_7ndb.test