diff options
| author | tsmith@quadxeon.mysql.com <> | 2007-06-15 23:57:53 +0200 |
|---|---|---|
| committer | tsmith@quadxeon.mysql.com <> | 2007-06-15 23:57:53 +0200 |
| commit | 891116551e23aa60043d17baf0c2dc6e2bf56e0d (patch) | |
| tree | da07e956111688dd9b654cc5bfbf984088736e54 | |
| parent | 2095627468e98d0e892a7dd27271fe82852152a6 (diff) | |
| download | mariadb-git-891116551e23aa60043d17baf0c2dc6e2bf56e0d.tar.gz | |
binlog.result, binlog.test:
Post-merge fix: replace xid=* with XID to isolate from number of transactions
| -rw-r--r-- | mysql-test/r/binlog.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/binlog.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/binlog.result b/mysql-test/r/binlog.result index 4ed6c50c7f6..6807da16e66 100644 --- a/mysql-test/r/binlog.result +++ b/mysql-test/r/binlog.result @@ -17,7 +17,7 @@ master-bin.000001 # Query 1 # use `test`; insert t1 values (5) master-bin.000001 # Query 1 # use `test`; COMMIT master-bin.000001 # Query 1 # use `test`; BEGIN master-bin.000001 # Query 1 # use `test`; insert t2 values (5) -master-bin.000001 # Xid 1 # COMMIT /* xid=13 */ +master-bin.000001 # Xid 1 # COMMIT /* XID */ drop table t1,t2; reset master; create table t1 (n int) engine=innodb; @@ -128,7 +128,7 @@ master-bin.000001 # Query 1 # use `test`; insert into t1 values(4 + 4) master-bin.000001 # Query 1 # use `test`; insert into t1 values(3 + 4) master-bin.000001 # Query 1 # use `test`; insert into t1 values(2 + 4) master-bin.000001 # Query 1 # use `test`; insert into t1 values(1 + 4) -master-bin.000001 # Xid 1 # COMMIT /* xid=20 */ +master-bin.000001 # Xid 1 # COMMIT /* XID */ master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 show binlog events in 'master-bin.000002' from 98; Log_name Pos Event_type Server_id End_log_pos Info diff --git a/mysql-test/t/binlog.test b/mysql-test/t/binlog.test index 2a7df23a2f5..accfa6a577f 100644 --- a/mysql-test/t/binlog.test +++ b/mysql-test/t/binlog.test @@ -21,8 +21,8 @@ begin; insert t2 values (5); commit; # first COMMIT must be Query_log_event, second - Xid_log_event ---replace_result "xid=22" "xid=13" --replace_column 2 # 5 # +--replace_regex /\/\* xid=.* \*\//\/* XID *\// show binlog events from 98; drop table t1,t2; @@ -43,8 +43,8 @@ while ($1) --enable_query_log commit; drop table t1; ---replace_result "xid=33" "xid=20" --replace_column 2 # 5 # +--replace_regex /\/\* xid=.* \*\//\/* XID *\// show binlog events in 'master-bin.000001' from 98; --replace_column 2 # 5 # show binlog events in 'master-bin.000002' from 98; |