summaryrefslogtreecommitdiff
path: root/mysql-test/t/binlog.test
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-02-23 18:26:49 +0100
committerunknown <serg@serg.mylan>2005-02-23 18:26:49 +0100
commitbe9f1863b7d2ca608926b2a262d22e091555b026 (patch)
tree3a85b2c0fb186dad2792584c636c03bced72b88a /mysql-test/t/binlog.test
parent0cd185ea6a54ca2c8980b6c18371ed365d53f07c (diff)
downloadmariadb-git-be9f1863b7d2ca608926b2a262d22e091555b026.tar.gz
don't log BEGIN in auto-commit mode
correct end_log_pos for Xid_log_event mysql-test/r/binlog.result: don't depend on the previous tests mysql-test/r/rpl_rotate_logs.result: correct end_log_pos for Xid_log_event mysql-test/t/binlog.test: don't depend on the previous tests sql/handler.h: comment sql/log_event.cc: advance position for Xid sql/log_event.h: comment sql/sql_class.h: correct end_log_pos for Xid_log_event sql/sql_parse.cc: make sure commit handler knows whether it's autocommit or not
Diffstat (limited to 'mysql-test/t/binlog.test')
-rw-r--r--mysql-test/t/binlog.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/binlog.test b/mysql-test/t/binlog.test
index bf2d949c106..2f97a5088ba 100644
--- a/mysql-test/t/binlog.test
+++ b/mysql-test/t/binlog.test
@@ -7,6 +7,7 @@
--disable_warnings
drop table if exists t1, t2;
--enable_warnings
+reset master;
create table t1 (a int) engine=bdb;
create table t2 (a int) engine=innodb;
@@ -17,6 +18,7 @@ begin;
insert t2 values (5);
commit;
# first COMMIT must be Query_log_event, second - Xid_log_event
+--replace_result "xid=891" "xid=318" "xid=11" "xid=318" "xid=18" "xid=318"
show binlog events from 96;
reset master;
drop table t1,t2;