summaryrefslogtreecommitdiff
path: root/mysql-test/t/mix_innodb_myisam_binlog.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t/mix_innodb_myisam_binlog.test')
-rw-r--r--mysql-test/t/mix_innodb_myisam_binlog.test9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/t/mix_innodb_myisam_binlog.test b/mysql-test/t/mix_innodb_myisam_binlog.test
index d8872fa6a1a..08a81c850eb 100644
--- a/mysql-test/t/mix_innodb_myisam_binlog.test
+++ b/mysql-test/t/mix_innodb_myisam_binlog.test
@@ -26,6 +26,7 @@ insert into t2 select * from t1;
commit;
--replace_column 5 #
+--replace_result "xid=12" "xid=7"
show binlog events from 96;
delete from t1;
@@ -54,6 +55,7 @@ rollback to savepoint my_savepoint;
commit;
--replace_column 5 #
+--replace_result "xid=45" "xid=24"
show binlog events from 96;
delete from t1;
@@ -71,6 +73,7 @@ commit;
select a from t1 order by a; # check that savepoints work :)
--replace_column 5 #
+--replace_result "xid=67" "xid=36"
show binlog events from 96;
# and when ROLLBACK is not explicit?
@@ -103,6 +106,7 @@ insert into t1 values(9);
insert into t2 select * from t1;
--replace_column 5 #
+--replace_result "xid=116" "xid=59"
show binlog events from 96;
# Check that when the query updat1ng the MyISAM table is the first in the
@@ -115,11 +119,13 @@ insert into t1 values(10); # first make t1 non-empty
begin;
insert into t2 select * from t1;
--replace_column 5 #
+--replace_result "xid=130" "xid=65"
show binlog events from 96;
insert into t1 values(11);
commit;
--replace_column 5 #
+--replace_result "xid=130" "xid=65" "xid=133" "xid=67"
show binlog events from 96;
@@ -138,6 +144,7 @@ insert into t2 select * from t1;
commit;
--replace_column 5 #
+--replace_result "xid=152" "xid=77"
show binlog events from 96;
delete from t1;
@@ -165,6 +172,7 @@ rollback to savepoint my_savepoint;
commit;
--replace_column 5 #
+--replace_result "xid=184" "xid=93"
show binlog events from 96;
delete from t1;
@@ -182,6 +190,7 @@ commit;
select a from t1 order by a; # check that savepoints work :)
--replace_column 5 #
+--replace_result "xid=205" "xid=104"
show binlog events from 96;
# Test for BUG#5714, where a MyISAM update in the transaction used to