summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqlbinlog.result
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-02-17 13:52:16 +0100
committerunknown <serg@serg.mylan>2005-02-17 13:52:16 +0100
commitc5c497164fbc48bcc50770ced833a07788082aaf (patch)
treeb920a7ed5633935af693da76909cc6f626123729 /mysql-test/r/mysqlbinlog.result
parent98db5e571fd01f063ae56aa2492f8d01a418815a (diff)
downloadmariadb-git-c5c497164fbc48bcc50770ced833a07788082aaf.tar.gz
post-review fixes. Now ROLLBACK is done in Format_description_log_event
mysql-test/t/mix_innodb_myisam_binlog.test: fix for --ps-protocol
Diffstat (limited to 'mysql-test/r/mysqlbinlog.result')
-rw-r--r--mysql-test/r/mysqlbinlog.result7
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result
index 601f7d6ae7e..ee0047934ab 100644
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@@ -15,6 +15,7 @@ flush logs;
--- Local --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
use test;
SET TIMESTAMP=1000000000;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -47,6 +48,7 @@ insert into t1 values ("Alas");
--- --database --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
SET INSERT_ID=1;
--- --position --
@@ -60,6 +62,7 @@ insert into t1 values ("Alas");
--- Remote --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
use test;
SET TIMESTAMP=1000000000;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -92,6 +95,7 @@ insert into t1 values ("Alas");
--- --database --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
SET INSERT_ID=1;
--- --position --
@@ -105,13 +109,12 @@ insert into t1 values ("Alas");
--- reading stdin --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
use test;
SET TIMESTAMP=1065204671;
BEGIN;
-ROLLBACK;
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
use test;
SET TIMESTAMP=1065204671;
BEGIN;
-ROLLBACK;
drop table t1, t2;