summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb_load_xa.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-10-15 22:42:08 +0200
committerSergei Golubchik <serg@mariadb.org>2014-10-15 22:42:08 +0200
commit42f359f9827340bf430a9f1a0bda9b059951ea08 (patch)
tree931331ce2d74ea3bc1048ae6715a3116de79228a /mysql-test/r/innodb_load_xa.result
parentf62c12b405ba7ec80b8e2490856b83c6f5899211 (diff)
downloadmariadb-git-42f359f9827340bf430a9f1a0bda9b059951ea08.tar.gz
after-merge fixes
Diffstat (limited to 'mysql-test/r/innodb_load_xa.result')
-rw-r--r--mysql-test/r/innodb_load_xa.result11
1 files changed, 3 insertions, 8 deletions
diff --git a/mysql-test/r/innodb_load_xa.result b/mysql-test/r/innodb_load_xa.result
index 85e6d52c098..bcf1dad6806 100644
--- a/mysql-test/r/innodb_load_xa.result
+++ b/mysql-test/r/innodb_load_xa.result
@@ -9,13 +9,8 @@ start transaction;
insert t1 values (1);
insert t1 values (2);
commit;
-include/show_binlog_events.inc
-Log_name Pos Event_type Server_id End_log_pos Info
-mysqld-bin.000001 # Gtid # # GTID #-#-#
-mysqld-bin.000001 # Query # # use `test`; create table t1 (a int) engine=innodb
-mysqld-bin.000001 # Gtid # # BEGIN GTID #-#-#
-mysqld-bin.000001 # Query # # use `test`; insert t1 values (1)
-mysqld-bin.000001 # Query # # use `test`; insert t1 values (2)
-mysqld-bin.000001 # Query # # COMMIT
+show status like 'Handler_prepare';
+Variable_name Value
+Handler_prepare 0
drop table t1;
uninstall plugin innodb;