| List: | Internals | « Previous MessageNext Message » | |
| From: | Lars Thalmann | Date: | June 17 2005 2:03pm |
| Subject: | bk commit into 5.0 tree (lars:1.1959) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.0 repository of lars. When lars does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.1959 05/06/17 14:03:27 lars@stripped +3 -0 Fix of 5.0 tree mysql-test/r/rpl_ddl.result 1.6 05/06/17 14:03:18 lars@stripped +0 -705 Fix of 5.0 tree mysql-test/include/rpl_stmt_seq.inc 1.4 05/06/17 14:03:18 lars@stripped +1 -1 Fix of 5.0 tree client/mysqltest.c 1.144 05/06/17 14:03:18 lars@stripped +54 -29 Fix of 5.0 tree # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: lars # Host: goldfish.site # Root: /home/bk/mysql-5.0 --- 1.3/mysql-test/include/rpl_stmt_seq.inc 2005-06-16 16:55:54 +02:00 +++ 1.4/mysql-test/include/rpl_stmt_seq.inc 2005-06-17 14:03:18 +02:00 @@ -7,7 +7,7 @@ ############################################################### # Debug options : To debug this test script ############################################################### -let $showbinlog= 0; +let $show_binlog= 0; let $manipulate= 1; ######## The typical test sequence --- 1.5/mysql-test/r/rpl_ddl.result 2005-06-16 19:04:36 +02:00 +++ 1.6/mysql-test/r/rpl_ddl.result 2005-06-17 14:03:18 +02:00 @@ -49,156 +49,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 1 -SHOW BINLOG EVENTS IN 'master-bin.000001'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1 -master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2 -master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3 -master-bin.000001 # Query 1 # CREATE DATABASE mysqltest1 -master-bin.000001 # Query 1 # CREATE DATABASE mysqltest2 -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0 -master-bin.000001 # Xid 1 # COMMIT /* xid=17 */ -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1) -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0 -master-bin.000001 # Xid 1 # COMMIT /* xid=25 */ -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 0 -SHOW BINLOG EVENTS IN 'slave-bin.000001'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000001 # Query 2 # use `test`; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9 -slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1 -slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2 -slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3 -slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest1 -slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest2 -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0 -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1) -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0 -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT) -------- switch to master ------- COMMIT; SELECT MAX(f1) FROM t1; MAX(f1) 1 -SHOW BINLOG EVENTS IN 'master-bin.000001'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1 -master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2 -master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3 -master-bin.000001 # Query 1 # CREATE DATABASE mysqltest1 -master-bin.000001 # Query 1 # CREATE DATABASE mysqltest2 -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0 -master-bin.000001 # Xid 1 # COMMIT /* xid=17 */ -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1) -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0 -master-bin.000001 # Xid 1 # COMMIT /* xid=25 */ -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT) -master-bin.000001 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000001 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 0 + 1 -master-bin.000001 # Xid 1 # COMMIT /* xid=50 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 1 -SHOW BINLOG EVENTS IN 'slave-bin.000001'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000001 # Query 2 # use `test`; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9 -slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1 -slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2 -slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3 -slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest1 -slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest2 -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0 -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1) -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0 -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT) -slave-bin.000001 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 0 + 1 -------- switch to master ------- ROLLBACK; @@ -207,42 +73,6 @@ 1 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000001'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1 -master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2 -master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3 -master-bin.000001 # Query 1 # CREATE DATABASE mysqltest1 -master-bin.000001 # Query 1 # CREATE DATABASE mysqltest2 -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0 -master-bin.000001 # Xid 1 # COMMIT /* xid=17 */ -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1) -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0 -master-bin.000001 # Xid 1 # COMMIT /* xid=25 */ -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB" -master-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT) -master-bin.000001 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000001 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 0 + 1 -master-bin.000001 # Xid 1 # COMMIT /* xid=50 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -250,39 +80,6 @@ 1 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000001'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000001 # Query 2 # use `test`; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9 -slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest1 -slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest2 -slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS mysqltest3 -slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest1 -slave-bin.000001 # Query 1 # CREATE DATABASE mysqltest2 -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t1 SET f1= 0 -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE INDEX my_idx6 ON mysqltest1.t6(f1) -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; INSERT INTO mysqltest1.t7 SET f1= 0 -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE= "InnoDB" -slave-bin.000001 # Query 1 # use `test`; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT) -slave-bin.000001 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 0 + 1 -------- switch to master ------- flush logs; @@ -299,34 +96,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 2 -SHOW BINLOG EVENTS IN 'master-bin.000002'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 1 -SHOW BINLOG EVENTS IN 'slave-bin.000002'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 1 -SHOW BINLOG EVENTS IN 'master-bin.000002'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 1 -SHOW BINLOG EVENTS IN 'slave-bin.000002'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- ROLLBACK; @@ -335,9 +120,6 @@ 1 TEST-INFO: MASTER: The INSERT is not committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000002'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -345,9 +127,6 @@ 1 TEST-INFO: SLAVE: The INSERT is not committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000002'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- flush logs; @@ -364,37 +143,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 2 -SHOW BINLOG EVENTS IN 'master-bin.000003'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000003 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 1 -SHOW BINLOG EVENTS IN 'slave-bin.000003'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000003 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- SET AUTOCOMMIT=1; SELECT MAX(f1) FROM t1; MAX(f1) 2 -SHOW BINLOG EVENTS IN 'master-bin.000003'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000003 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000003 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 1 + 1 -master-bin.000003 # Xid 1 # COMMIT /* xid=89 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 2 -SHOW BINLOG EVENTS IN 'slave-bin.000003'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000003 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000003 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 1 + 1 -------- switch to master ------- ROLLBACK; @@ -403,11 +167,6 @@ 2 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000003'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000003 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000003 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 1 + 1 -master-bin.000003 # Xid 1 # COMMIT /* xid=89 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -415,10 +174,6 @@ 2 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000003'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000003 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000003 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 1 + 1 -------- switch to master ------- flush logs; @@ -436,38 +191,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 3 -SHOW BINLOG EVENTS IN 'master-bin.000004'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000004 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 2 -SHOW BINLOG EVENTS IN 'slave-bin.000004'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000004 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- START TRANSACTION; SELECT MAX(f1) FROM t1; MAX(f1) 3 -SHOW BINLOG EVENTS IN 'master-bin.000004'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000004 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000004 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000004 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 2 + 1 -master-bin.000004 # Xid 1 # COMMIT /* xid=132 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 3 -SHOW BINLOG EVENTS IN 'slave-bin.000004'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000004 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000004 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 2 + 1 -------- switch to master ------- ROLLBACK; @@ -476,12 +215,6 @@ 3 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000004'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000004 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000004 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000004 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 2 + 1 -master-bin.000004 # Xid 1 # COMMIT /* xid=132 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -489,10 +222,6 @@ 3 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000004'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000004 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000004 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 2 + 1 -------- switch to master ------- flush logs; @@ -509,38 +238,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 4 -SHOW BINLOG EVENTS IN 'master-bin.000005'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000005 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 3 -SHOW BINLOG EVENTS IN 'slave-bin.000005'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000005 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- BEGIN; SELECT MAX(f1) FROM t1; MAX(f1) 4 -SHOW BINLOG EVENTS IN 'master-bin.000005'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000005 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000005 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000005 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 3 + 1 -master-bin.000005 # Xid 1 # COMMIT /* xid=144 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 4 -SHOW BINLOG EVENTS IN 'slave-bin.000005'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000005 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000005 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 3 + 1 -------- switch to master ------- ROLLBACK; @@ -549,12 +262,6 @@ 4 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000005'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000005 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000005 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000005 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 3 + 1 -master-bin.000005 # Xid 1 # COMMIT /* xid=144 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -562,10 +269,6 @@ 4 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000005'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000005 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000005 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 3 + 1 -------- switch to master ------- flush logs; @@ -582,40 +285,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 5 -SHOW BINLOG EVENTS IN 'master-bin.000006'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000006 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 4 -SHOW BINLOG EVENTS IN 'slave-bin.000006'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000006 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- DROP TABLE mysqltest1.t2; SELECT MAX(f1) FROM t1; MAX(f1) 5 -SHOW BINLOG EVENTS IN 'master-bin.000006'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000006 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000006 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000006 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 4 + 1 -master-bin.000006 # Xid 1 # COMMIT /* xid=171 */ -master-bin.000006 # Query 1 # use `mysqltest1`; DROP TABLE mysqltest1.t2 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 5 -SHOW BINLOG EVENTS IN 'slave-bin.000006'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000006 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000006 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 4 + 1 -slave-bin.000006 # Query 1 # use `mysqltest1`; DROP TABLE mysqltest1.t2 -------- switch to master ------- ROLLBACK; @@ -624,13 +309,6 @@ 5 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000006'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000006 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000006 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000006 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 4 + 1 -master-bin.000006 # Xid 1 # COMMIT /* xid=171 */ -master-bin.000006 # Query 1 # use `mysqltest1`; DROP TABLE mysqltest1.t2 -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -638,11 +316,6 @@ 5 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000006'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000006 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000006 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 4 + 1 -slave-bin.000006 # Query 1 # use `mysqltest1`; DROP TABLE mysqltest1.t2 -------- switch to master ------- flush logs; @@ -667,34 +340,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 6 -SHOW BINLOG EVENTS IN 'master-bin.000007'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000007 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 5 -SHOW BINLOG EVENTS IN 'slave-bin.000007'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000007 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- DROP TEMPORARY TABLE mysqltest1.t23; SELECT MAX(f1) FROM t1; MAX(f1) 6 -SHOW BINLOG EVENTS IN 'master-bin.000007'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000007 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 5 -SHOW BINLOG EVENTS IN 'slave-bin.000007'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000007 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- ROLLBACK; @@ -705,13 +366,6 @@ 5 TEST-INFO: MASTER: The INSERT is not committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000007'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000007 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000007 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000007 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1 -master-bin.000007 # Query 1 # use `mysqltest1`; DROP TEMPORARY TABLE mysqltest1.t23 -master-bin.000007 # Query 1 # use `mysqltest1`; ROLLBACK -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -719,11 +373,6 @@ 6 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000007'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000007 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000007 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1 -slave-bin.000007 # Query 1 # use `mysqltest1`; DROP TEMPORARY TABLE mysqltest1.t23 -------- switch to master ------- flush logs; @@ -748,40 +397,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 6 -SHOW BINLOG EVENTS IN 'master-bin.000008'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000008 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 6 -SHOW BINLOG EVENTS IN 'slave-bin.000008'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000008 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- RENAME TABLE mysqltest1.t3 to mysqltest1.t20; SELECT MAX(f1) FROM t1; MAX(f1) 6 -SHOW BINLOG EVENTS IN 'master-bin.000008'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000008 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000008 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000008 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1 -master-bin.000008 # Xid 1 # COMMIT /* xid=228 */ -master-bin.000008 # Query 1 # use `mysqltest1`; RENAME TABLE mysqltest1.t3 to mysqltest1.t20 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 6 -SHOW BINLOG EVENTS IN 'slave-bin.000008'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000008 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000008 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1 -slave-bin.000008 # Query 1 # use `mysqltest1`; RENAME TABLE mysqltest1.t3 to mysqltest1.t20 -------- switch to master ------- ROLLBACK; @@ -790,13 +421,6 @@ 6 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000008'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000008 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000008 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000008 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1 -master-bin.000008 # Xid 1 # COMMIT /* xid=228 */ -master-bin.000008 # Query 1 # use `mysqltest1`; RENAME TABLE mysqltest1.t3 to mysqltest1.t20 -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -804,11 +428,6 @@ 6 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000008'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000008 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000008 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 5 + 1 -slave-bin.000008 # Query 1 # use `mysqltest1`; RENAME TABLE mysqltest1.t3 to mysqltest1.t20 -------- switch to master ------- flush logs; @@ -835,40 +454,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 7 -SHOW BINLOG EVENTS IN 'master-bin.000009'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000009 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 6 -SHOW BINLOG EVENTS IN 'slave-bin.000009'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000009 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT; SELECT MAX(f1) FROM t1; MAX(f1) 7 -SHOW BINLOG EVENTS IN 'master-bin.000009'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000009 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000009 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000009 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 6 + 1 -master-bin.000009 # Xid 1 # COMMIT /* xid=257 */ -master-bin.000009 # Query 1 # use `mysqltest1`; ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 7 -SHOW BINLOG EVENTS IN 'slave-bin.000009'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000009 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000009 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 6 + 1 -slave-bin.000009 # Query 1 # use `mysqltest1`; ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT -------- switch to master ------- ROLLBACK; @@ -877,13 +478,6 @@ 7 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000009'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000009 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000009 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000009 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 6 + 1 -master-bin.000009 # Xid 1 # COMMIT /* xid=257 */ -master-bin.000009 # Query 1 # use `mysqltest1`; ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -891,11 +485,6 @@ 7 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000009'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000009 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000009 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 6 + 1 -slave-bin.000009 # Query 1 # use `mysqltest1`; ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT -------- switch to master ------- flush logs; @@ -924,40 +513,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 8 -SHOW BINLOG EVENTS IN 'master-bin.000010'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000010 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 7 -SHOW BINLOG EVENTS IN 'slave-bin.000010'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000010 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB"; SELECT MAX(f1) FROM t1; MAX(f1) 8 -SHOW BINLOG EVENTS IN 'master-bin.000010'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000010 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000010 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000010 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 7 + 1 -master-bin.000010 # Xid 1 # COMMIT /* xid=286 */ -master-bin.000010 # Query 1 # use `mysqltest1`; CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB" -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 8 -SHOW BINLOG EVENTS IN 'slave-bin.000010'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000010 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000010 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 7 + 1 -slave-bin.000010 # Query 1 # use `mysqltest1`; CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB" -------- switch to master ------- ROLLBACK; @@ -966,13 +537,6 @@ 8 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000010'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000010 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000010 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000010 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 7 + 1 -master-bin.000010 # Xid 1 # COMMIT /* xid=286 */ -master-bin.000010 # Query 1 # use `mysqltest1`; CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB" -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -980,11 +544,6 @@ 8 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000010'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000010 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000010 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 7 + 1 -slave-bin.000010 # Query 1 # use `mysqltest1`; CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB" -------- switch to master ------- flush logs; @@ -1001,34 +560,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 9 -SHOW BINLOG EVENTS IN 'master-bin.000011'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000011 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 8 -SHOW BINLOG EVENTS IN 'slave-bin.000011'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000011 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT); SELECT MAX(f1) FROM t1; MAX(f1) 9 -SHOW BINLOG EVENTS IN 'master-bin.000011'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000011 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 8 -SHOW BINLOG EVENTS IN 'slave-bin.000011'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000011 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- ROLLBACK; @@ -1039,13 +586,6 @@ 8 TEST-INFO: MASTER: The INSERT is not committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000011'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000011 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000011 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000011 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1 -master-bin.000011 # Query 1 # use `mysqltest1`; CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT) -master-bin.000011 # Query 1 # use `mysqltest1`; ROLLBACK -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -1053,11 +593,6 @@ 9 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000011'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000011 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000011 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1 -slave-bin.000011 # Query 1 # use `mysqltest1`; CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT) -------- switch to master ------- flush logs; @@ -1074,41 +609,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 9 -SHOW BINLOG EVENTS IN 'master-bin.000012'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000012 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 9 -SHOW BINLOG EVENTS IN 'slave-bin.000012'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000012 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- TRUNCATE TABLE mysqltest1.t7; SELECT MAX(f1) FROM t1; MAX(f1) 9 -SHOW BINLOG EVENTS IN 'master-bin.000012'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000012 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000012 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000012 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1 -master-bin.000012 # Xid 1 # COMMIT /* xid=343 */ -master-bin.000012 # Query 1 # use `mysqltest1`; TRUNCATE TABLE mysqltest1.t7 -master-bin.000012 # Xid 1 # COMMIT /* xid=364 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 9 -SHOW BINLOG EVENTS IN 'slave-bin.000012'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000012 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000012 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1 -slave-bin.000012 # Query 1 # use `mysqltest1`; TRUNCATE TABLE mysqltest1.t7 -------- switch to master ------- ROLLBACK; @@ -1117,14 +633,6 @@ 9 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000012'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000012 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000012 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000012 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1 -master-bin.000012 # Xid 1 # COMMIT /* xid=343 */ -master-bin.000012 # Query 1 # use `mysqltest1`; TRUNCATE TABLE mysqltest1.t7 -master-bin.000012 # Xid 1 # COMMIT /* xid=364 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -1132,11 +640,6 @@ 9 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000012'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000012 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000012 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 8 + 1 -slave-bin.000012 # Query 1 # use `mysqltest1`; TRUNCATE TABLE mysqltest1.t7 -------- switch to master ------- flush logs; @@ -1161,38 +664,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 10 -SHOW BINLOG EVENTS IN 'master-bin.000013'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000013 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 9 -SHOW BINLOG EVENTS IN 'slave-bin.000013'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000013 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ; SELECT MAX(f1) FROM t1; MAX(f1) 10 -SHOW BINLOG EVENTS IN 'master-bin.000013'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000013 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000013 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000013 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 9 + 1 -master-bin.000013 # Xid 1 # COMMIT /* xid=370 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -SHOW BINLOG EVENTS IN 'slave-bin.000013'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000013 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000013 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 9 + 1 -------- switch to master ------- ROLLBACK; @@ -1201,12 +688,6 @@ 10 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000013'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000013 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000013 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000013 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 9 + 1 -master-bin.000013 # Xid 1 # COMMIT /* xid=370 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -1214,10 +695,6 @@ 10 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000013'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000013 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000013 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 9 + 1 -------- switch to master ------- flush logs; @@ -1235,34 +712,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 11 -SHOW BINLOG EVENTS IN 'master-bin.000014'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000014 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -SHOW BINLOG EVENTS IN 'slave-bin.000014'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000014 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- UNLOCK TABLES; SELECT MAX(f1) FROM t1; MAX(f1) 11 -SHOW BINLOG EVENTS IN 'master-bin.000014'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000014 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -SHOW BINLOG EVENTS IN 'slave-bin.000014'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000014 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- ROLLBACK; @@ -1271,9 +736,6 @@ 10 TEST-INFO: MASTER: The INSERT is not committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000014'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000014 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -1281,9 +743,6 @@ 10 TEST-INFO: SLAVE: The INSERT is not committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000014'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000014 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- flush logs; @@ -1302,34 +761,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 10 -SHOW BINLOG EVENTS IN 'master-bin.000015'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000015 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -SHOW BINLOG EVENTS IN 'slave-bin.000015'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000015 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- UNLOCK TABLES; SELECT MAX(f1) FROM t1; MAX(f1) 10 -SHOW BINLOG EVENTS IN 'master-bin.000015'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000015 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -SHOW BINLOG EVENTS IN 'slave-bin.000015'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000015 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- ROLLBACK; @@ -1338,9 +785,6 @@ 10 TEST-INFO: MASTER: The INSERT is not committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000015'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000015 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -1348,9 +792,6 @@ 10 TEST-INFO: SLAVE: The INSERT is not committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000015'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000015 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- flush logs; @@ -1368,38 +809,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 11 -SHOW BINLOG EVENTS IN 'master-bin.000016'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000016 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -SHOW BINLOG EVENTS IN 'slave-bin.000016'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000016 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- UNLOCK TABLES; SELECT MAX(f1) FROM t1; MAX(f1) 11 -SHOW BINLOG EVENTS IN 'master-bin.000016'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000016 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000016 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000016 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 10 + 1 -master-bin.000016 # Xid 1 # COMMIT /* xid=463 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 11 -SHOW BINLOG EVENTS IN 'slave-bin.000016'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000016 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000016 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 10 + 1 -------- switch to master ------- ROLLBACK; @@ -1408,12 +833,6 @@ 11 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000016'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000016 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000016 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000016 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 10 + 1 -master-bin.000016 # Xid 1 # COMMIT /* xid=463 */ -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -1421,10 +840,6 @@ 11 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000016'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000016 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000016 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 10 + 1 -------- switch to master ------- flush logs; @@ -1441,40 +856,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 12 -SHOW BINLOG EVENTS IN 'master-bin.000017'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000017 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 11 -SHOW BINLOG EVENTS IN 'slave-bin.000017'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000017 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- DROP INDEX my_idx6 ON mysqltest1.t6; SELECT MAX(f1) FROM t1; MAX(f1) 12 -SHOW BINLOG EVENTS IN 'master-bin.000017'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000017 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000017 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000017 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 11 + 1 -master-bin.000017 # Xid 1 # COMMIT /* xid=483 */ -master-bin.000017 # Query 1 # use `mysqltest1`; DROP INDEX my_idx6 ON mysqltest1.t6 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 12 -SHOW BINLOG EVENTS IN 'slave-bin.000017'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000017 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000017 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 11 + 1 -slave-bin.000017 # Query 1 # use `mysqltest1`; DROP INDEX my_idx6 ON mysqltest1.t6 -------- switch to master ------- ROLLBACK; @@ -1483,13 +880,6 @@ 12 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000017'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000017 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000017 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000017 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 11 + 1 -master-bin.000017 # Xid 1 # COMMIT /* xid=483 */ -master-bin.000017 # Query 1 # use `mysqltest1`; DROP INDEX my_idx6 ON mysqltest1.t6 -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -1497,11 +887,6 @@ 12 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000017'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000017 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000017 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 11 + 1 -slave-bin.000017 # Query 1 # use `mysqltest1`; DROP INDEX my_idx6 ON mysqltest1.t6 -------- switch to master ------- flush logs; @@ -1526,40 +911,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 13 -SHOW BINLOG EVENTS IN 'master-bin.000018'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000018 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 12 -SHOW BINLOG EVENTS IN 'slave-bin.000018'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000018 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- CREATE INDEX my_idx5 ON mysqltest1.t5(f1); SELECT MAX(f1) FROM t1; MAX(f1) 13 -SHOW BINLOG EVENTS IN 'master-bin.000018'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000018 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000018 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000018 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 12 + 1 -master-bin.000018 # Xid 1 # COMMIT /* xid=510 */ -master-bin.000018 # Query 1 # use `mysqltest1`; CREATE INDEX my_idx5 ON mysqltest1.t5(f1) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 13 -SHOW BINLOG EVENTS IN 'slave-bin.000018'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000018 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000018 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 12 + 1 -slave-bin.000018 # Query 1 # use `mysqltest1`; CREATE INDEX my_idx5 ON mysqltest1.t5(f1) -------- switch to master ------- ROLLBACK; @@ -1568,13 +935,6 @@ 13 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000018'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000018 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000018 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000018 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 12 + 1 -master-bin.000018 # Xid 1 # COMMIT /* xid=510 */ -master-bin.000018 # Query 1 # use `mysqltest1`; CREATE INDEX my_idx5 ON mysqltest1.t5(f1) -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -1582,11 +942,6 @@ 13 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000018'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000018 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000018 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 12 + 1 -slave-bin.000018 # Query 1 # use `mysqltest1`; CREATE INDEX my_idx5 ON mysqltest1.t5(f1) -------- switch to master ------- flush logs; @@ -1613,40 +968,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 14 -SHOW BINLOG EVENTS IN 'master-bin.000019'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000019 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 13 -SHOW BINLOG EVENTS IN 'slave-bin.000019'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000019 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- DROP DATABASE mysqltest2; SELECT MAX(f1) FROM t1; MAX(f1) 14 -SHOW BINLOG EVENTS IN 'master-bin.000019'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000019 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000019 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000019 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 13 + 1 -master-bin.000019 # Xid 1 # COMMIT /* xid=539 */ -master-bin.000019 # Query 1 # DROP DATABASE mysqltest2 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 14 -SHOW BINLOG EVENTS IN 'slave-bin.000019'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000019 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000019 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 13 + 1 -slave-bin.000019 # Query 1 # DROP DATABASE mysqltest2 -------- switch to master ------- ROLLBACK; @@ -1655,13 +992,6 @@ 14 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000019'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000019 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000019 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000019 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 13 + 1 -master-bin.000019 # Xid 1 # COMMIT /* xid=539 */ -master-bin.000019 # Query 1 # DROP DATABASE mysqltest2 -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -1669,11 +999,6 @@ 14 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000019'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000019 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000019 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 13 + 1 -slave-bin.000019 # Query 1 # DROP DATABASE mysqltest2 -------- switch to master ------- flush logs; @@ -1698,40 +1023,22 @@ SELECT MAX(f1) FROM t1; MAX(f1) 15 -SHOW BINLOG EVENTS IN 'master-bin.000020'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000020 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 14 -SHOW BINLOG EVENTS IN 'slave-bin.000020'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000020 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -------- switch to master ------- CREATE DATABASE mysqltest3; SELECT MAX(f1) FROM t1; MAX(f1) 15 -SHOW BINLOG EVENTS IN 'master-bin.000020'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000020 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000020 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000020 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 14 + 1 -master-bin.000020 # Xid 1 # COMMIT /* xid=568 */ -master-bin.000020 # Query 1 # CREATE DATABASE mysqltest3 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 15 -SHOW BINLOG EVENTS IN 'slave-bin.000020'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000020 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000020 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 14 + 1 -slave-bin.000020 # Query 1 # CREATE DATABASE mysqltest3 -------- switch to master ------- ROLLBACK; @@ -1740,13 +1047,6 @@ 15 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'master-bin.000020'; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000020 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000020 # Query 1 # use `mysqltest1`; BEGIN -master-bin.000020 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 14 + 1 -master-bin.000020 # Xid 1 # COMMIT /* xid=568 */ -master-bin.000020 # Query 1 # CREATE DATABASE mysqltest3 -------- switch to slave -------- SELECT MAX(f1) FROM t1; @@ -1754,11 +1054,6 @@ 15 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -SHOW BINLOG EVENTS IN 'slave-bin.000020'; -Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000020 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000020 # Query 1 # use `mysqltest1`; INSERT INTO t1 SET f1= 14 + 1 -slave-bin.000020 # Query 1 # CREATE DATABASE mysqltest3 -------- switch to master ------- flush logs; --- 1.143/client/mysqltest.c 2005-06-16 19:04:36 +02:00 +++ 1.144/client/mysqltest.c 2005-06-17 14:03:18 +02:00 @@ -164,10 +164,17 @@ static char delimiter[MAX_DELIMITER]= DEFAULT_DELIMITER; static uint delimiter_length= 1; -static int *cur_block, *block_stack_end; -static int block_stack[BLOCK_STACK_DEPTH]; +/* Block stack */ +enum block_cmd { cmd_none, cmd_if, cmd_while }; +typedef struct +{ + int line; /* Start line of block */ + my_bool ok; /* Should block be executed */ + enum block_cmd cmd; /* Command owning the block */ +} BLOCK; +static BLOCK block_stack[BLOCK_STACK_DEPTH]; +static BLOCK *cur_block, *block_stack_end; -static int block_ok_stack[BLOCK_STACK_DEPTH]; static CHARSET_INFO *charset_info= &my_charset_latin1; /* Default charset */ static const char *charset_name= "latin1"; /* Default character set name */ @@ -221,8 +228,6 @@ PARSER parser; MASTER_POS master_pos; -int *block_ok; /* set to 0 if the current block should not be executed */ -int false_block_depth = 0; /* if set, all results are concated and compared against this file */ const char *result_file = 0; @@ -296,6 +301,7 @@ Q_CHARACTER_SET, Q_DISABLE_PS_PROTOCOL, Q_ENABLE_PS_PROTOCOL, Q_EXIT, Q_DISABLE_RECONNECT, Q_ENABLE_RECONNECT, +Q_IF, Q_UNKNOWN, /* Unknown command. */ Q_COMMENT, /* Comments, ignored. */ @@ -386,6 +392,7 @@ "exit", "disable_reconnect", "enable_reconnect", + "if", 0 }; @@ -1924,36 +1931,54 @@ int do_done(struct st_query* q) { + /* Dummy statement to eliminate compiler warning */ q->type = Q_END_BLOCK; + + /* Check if empty block stack */ if (cur_block == block_stack) die("Stray '}' - end of block before beginning"); - if (*block_ok--) + + /* Test if inner block has been executed */ + if (cur_block->ok && cur_block->cmd == cmd_while) { - parser.current_line = *--cur_block; + /* Pop block from stack, re-execute outer block */ + cur_block--; + parser.current_line = cur_block->line; } else { - ++parser.current_line; - --cur_block; + /* Pop block from stack, goto next line */ + cur_block--; + parser.current_line++; } return 0; } -int do_while(struct st_query* q) + +int do_block(enum block_cmd cmd, struct st_query* q) { char* p=q->first_argument; const char* expr_start, *expr_end; VAR v; + + /* Check stack overflow */ if (cur_block == block_stack_end) die("Nesting too deeply"); - if (!*block_ok) + + /* Set way to find outer block again, increase line counter */ + cur_block->line= parser.current_line++; + + /* If this block is ignored */ + if (!cur_block->ok) { - ++false_block_depth; - *++block_ok = 0; - *cur_block++ = parser.current_line++; + /* Inner block should be ignored too */ + cur_block++; + cur_block->cmd= cmd; + cur_block->ok= FALSE; return 0; } + /* Parse and evaluate test expression */ expr_start = strchr(p, '('); if (!expr_start) die("missing '(' in while"); @@ -1962,14 +1987,12 @@ die("missing ')' in while"); var_init(&v,0,0,0,0); eval_expr(&v, ++expr_start, &expr_end); - *cur_block++ = parser.current_line++; - if (!v.int_val) - { - *++block_ok = 0; - false_block_depth++; - } - else - *++block_ok = 1; + + /* Define inner block */ + cur_block++; + cur_block->cmd= cmd; + cur_block->ok= (v.int_val ? TRUE : FALSE); + var_free(&v); return 0; } @@ -3653,12 +3676,13 @@ lineno = lineno_stack; my_init_dynamic_array(&q_lines, sizeof(struct st_query*), INIT_Q_LINES, INIT_Q_LINES); + memset(block_stack, 0, sizeof(block_stack)); - block_stack_end = block_stack + BLOCK_STACK_DEPTH; - memset(block_ok_stack, 0, sizeof(block_stack)); - cur_block = block_stack; - block_ok = block_ok_stack; - *block_ok = 1; + block_stack_end= block_stack + BLOCK_STACK_DEPTH; + cur_block= block_stack; + cur_block->ok= TRUE; /* Outer block should always be executed */ + cur_block->cmd= cmd_none; + init_dynamic_string(&ds_res, "", 0, 65536); parse_args(argc, argv); @@ -3712,7 +3736,7 @@ int current_line_inc = 1, processed = 0; if (q->type == Q_UNKNOWN || q->type == Q_COMMENT_WITH_COMMAND) get_query_type(q); - if (*block_ok) + if (cur_block->ok) { processed = 1; switch (q->type) { @@ -3915,7 +3939,8 @@ { current_line_inc = 0; switch (q->type) { - case Q_WHILE: do_while(q); break; + case Q_WHILE: do_block(cmd_while, q); break; + case Q_IF: do_block(cmd_if, q); break; case Q_END_BLOCK: do_done(q); break; default: current_line_inc = 1; break; }
| Thread | ||
|---|---|---|
| • bk commit into 5.0 tree (lars:1.1959) | Lars Thalmann | 17 Jun |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.891 sec. using MySQL 5.1.14-beta-log