diff options
| author | unknown <serg@serg.mylan> | 2005-02-23 18:26:49 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-23 18:26:49 +0100 |
| commit | be9f1863b7d2ca608926b2a262d22e091555b026 (patch) | |
| tree | 3a85b2c0fb186dad2792584c636c03bced72b88a /mysql-test/r/binlog.result | |
| parent | 0cd185ea6a54ca2c8980b6c18371ed365d53f07c (diff) | |
| download | mariadb-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/r/binlog.result')
| -rw-r--r-- | mysql-test/r/binlog.result | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/binlog.result b/mysql-test/r/binlog.result index c49b764ed8d..4a54ccebd58 100644 --- a/mysql-test/r/binlog.result +++ b/mysql-test/r/binlog.result @@ -1,4 +1,5 @@ drop table if exists t1, t2; +reset master; create table t1 (a int) engine=bdb; create table t2 (a int) engine=innodb; begin; @@ -9,14 +10,13 @@ insert t2 values (5); commit; show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 96 Query 1 187 use `test`; drop table if exists t1, t2 -master-bin.000001 187 Query 1 285 use `test`; create table t1 (a int) engine=bdb -master-bin.000001 285 Query 1 386 use `test`; create table t2 (a int) engine=innodb -master-bin.000001 386 Query 1 455 use `test`; BEGIN -master-bin.000001 455 Query 1 84 use `test`; insert t1 values (5) -master-bin.000001 539 Query 1 154 use `test`; COMMIT -master-bin.000001 609 Query 1 678 use `test`; BEGIN -master-bin.000001 678 Query 1 84 use `test`; insert t2 values (5) -master-bin.000001 762 Xid 1 111 COMMIT /* xid=10 */ +master-bin.000001 96 Query 1 194 use `test`; create table t1 (a int) engine=bdb +master-bin.000001 194 Query 1 295 use `test`; create table t2 (a int) engine=innodb +master-bin.000001 295 Query 1 364 use `test`; BEGIN +master-bin.000001 364 Query 1 84 use `test`; insert t1 values (5) +master-bin.000001 448 Query 1 518 use `test`; COMMIT +master-bin.000001 518 Query 1 587 use `test`; BEGIN +master-bin.000001 587 Query 1 84 use `test`; insert t2 values (5) +master-bin.000001 671 Xid 1 698 COMMIT /* xid=318 */ reset master; drop table t1,t2; |