diff options
Diffstat (limited to 'mysql-test/r/mix_innodb_myisam_binlog.result')
| -rw-r--r-- | mysql-test/r/mix_innodb_myisam_binlog.result | 125 |
1 files changed, 66 insertions, 59 deletions
diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result index 96a2ac551a9..ac2b2cfbed1 100644 --- a/mysql-test/r/mix_innodb_myisam_binlog.result +++ b/mysql-test/r/mix_innodb_myisam_binlog.result @@ -6,12 +6,12 @@ begin; insert into t1 values(1); insert into t2 select * from t1; commit; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(1) -master-bin.000001 252 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 347 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(1) +master-bin.000001 239 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 327 Xid 1 # COMMIT /* xid=7 */ delete from t1; delete from t2; reset master; @@ -21,12 +21,12 @@ insert into t2 select * from t1; rollback; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(2) -master-bin.000001 252 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 347 Query 1 # use `test`; ROLLBACK +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(2) +master-bin.000001 239 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 327 Query 1 # use `test`; ROLLBACK delete from t1; delete from t2; reset master; @@ -39,15 +39,15 @@ rollback to savepoint my_savepoint; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back commit; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(3) -master-bin.000001 252 Query 1 # use `test`; savepoint my_savepoint -master-bin.000001 338 Query 1 # use `test`; insert into t1 values(4) -master-bin.000001 426 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 521 Query 1 # use `test`; rollback to savepoint my_savepoint -master-bin.000001 619 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(3) +master-bin.000001 239 Query 1 # use `test`; savepoint my_savepoint +master-bin.000001 318 Query 1 # use `test`; insert into t1 values(4) +master-bin.000001 399 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 487 Query 1 # use `test`; rollback to savepoint my_savepoint +master-bin.000001 578 Xid 1 # COMMIT /* xid=24 */ delete from t1; delete from t2; reset master; @@ -65,16 +65,16 @@ select a from t1 order by a; a 5 7 -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(5) -master-bin.000001 252 Query 1 # use `test`; savepoint my_savepoint -master-bin.000001 338 Query 1 # use `test`; insert into t1 values(6) -master-bin.000001 426 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 521 Query 1 # use `test`; rollback to savepoint my_savepoint -master-bin.000001 619 Query 1 # use `test`; insert into t1 values(7) -master-bin.000001 707 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(5) +master-bin.000001 239 Query 1 # use `test`; savepoint my_savepoint +master-bin.000001 318 Query 1 # use `test`; insert into t1 values(6) +master-bin.000001 399 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 487 Query 1 # use `test`; rollback to savepoint my_savepoint +master-bin.000001 578 Query 1 # use `test`; insert into t1 values(7) +master-bin.000001 659 Xid 1 # COMMIT /* xid=36 */ delete from t1; delete from t2; reset master; @@ -87,40 +87,47 @@ insert into t2 select * from t1; select get_lock("a",10); get_lock("a",10) 1 -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(8) -master-bin.000001 252 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 347 Query 1 # use `test`; ROLLBACK +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(8) +master-bin.000001 239 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 327 Query 1 # use `test`; ROLLBACK +master-bin.000001 392 Query 1 # use `test`; DO RELEASE_LOCK("a") delete from t1; delete from t2; reset master; insert into t1 values(9); insert into t2 select * from t1; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; insert into t1 values(9) -master-bin.000001 183 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(9) +master-bin.000001 239 Xid 1 # COMMIT /* xid=59 */ +master-bin.000001 266 Query 1 # use `test`; insert into t2 select * from t1 delete from t1; delete from t2; reset master; insert into t1 values(10); begin; insert into t2 select * from t1; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; insert into t1 values(10) -master-bin.000001 184 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(10) +master-bin.000001 240 Xid 1 # COMMIT /* xid=65 */ +master-bin.000001 267 Query 1 # use `test`; insert into t2 select * from t1 insert into t1 values(11); commit; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; insert into t1 values(10) -master-bin.000001 184 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 279 Query 1 # use `test`; BEGIN -master-bin.000001 348 Query 1 # use `test`; insert into t1 values(11) -master-bin.000001 437 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(10) +master-bin.000001 240 Xid 1 # COMMIT /* xid=65 */ +master-bin.000001 267 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 355 Query 1 # use `test`; BEGIN +master-bin.000001 417 Query 1 # use `test`; insert into t1 values(11) +master-bin.000001 499 Xid 1 # COMMIT /* xid=67 */ alter table t2 engine=INNODB; delete from t1; delete from t2; @@ -129,12 +136,12 @@ begin; insert into t1 values(12); insert into t2 select * from t1; commit; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(12) -master-bin.000001 253 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 348 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(12) +master-bin.000001 240 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 328 Xid 1 # COMMIT /* xid=77 */ delete from t1; delete from t2; reset master; @@ -142,7 +149,7 @@ begin; insert into t1 values(13); insert into t2 select * from t1; rollback; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info delete from t1; delete from t2; @@ -154,11 +161,11 @@ insert into t1 values(15); insert into t2 select * from t1; rollback to savepoint my_savepoint; commit; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(14) -master-bin.000001 253 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(14) +master-bin.000001 240 Xid 1 # COMMIT /* xid=93 */ delete from t1; delete from t2; reset master; @@ -174,12 +181,12 @@ select a from t1 order by a; a 16 18 -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(16) -master-bin.000001 253 Query 1 # use `test`; insert into t1 values(18) -master-bin.000001 342 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(16) +master-bin.000001 240 Query 1 # use `test`; insert into t1 values(18) +master-bin.000001 322 Xid 1 # COMMIT /* xid=104 */ delete from t1; delete from t2; alter table t2 type=MyISAM; |