diff options
author | unknown <knielsen@knielsen-hq.org> | 2011-01-27 15:56:44 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2011-01-27 15:56:44 +0100 |
commit | bd8942070bf70decafa41996a2260da2c309b4e1 (patch) | |
tree | 290a7055eb389b92db39b4bba0856ecb6fc2537f /mysql-test/r/mysqldump-max.result | |
parent | 2b5a9147c84ab3bedc4ea2bfe3a2fc83808e9047 (diff) | |
download | mariadb-git-bd8942070bf70decafa41996a2260da2c309b4e1.tar.gz |
After-merge fixes for MWL#47 (which causes changes in binlog positions in .result files).
Also fix one incorrect printf() format.
Diffstat (limited to 'mysql-test/r/mysqldump-max.result')
-rw-r--r-- | mysql-test/r/mysqldump-max.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/mysqldump-max.result b/mysql-test/r/mysqldump-max.result index d4509b51923..aaa31f8b45d 100644 --- a/mysql-test/r/mysqldump-max.result +++ b/mysql-test/r/mysqldump-max.result @@ -334,10 +334,10 @@ DROP TABLE t1; DROP TABLE t2; SHOW BINLOG EVENTS LIMIT 6,3; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 524 Query 1 592 BEGIN -master-bin.000001 592 Query 1 689 use `test`; INSERT INTO t2 VALUES (1,0), (2,0) -master-bin.000001 689 Xid 1 716 COMMIT /* XID */ --- CHANGE MASTER TO MASTER_LOG_FILE='./master-bin.000001', MASTER_LOG_POS=716; +master-bin.000001 658 Query 1 726 BEGIN +master-bin.000001 726 Query 1 823 use `test`; INSERT INTO t2 VALUES (1,0), (2,0) +master-bin.000001 823 Xid 1 850 COMMIT /* XID */ +-- CHANGE MASTER TO MASTER_LOG_FILE='./master-bin.000001', MASTER_LOG_POS=850; SELECT * FROM t1 ORDER BY a; a 1 |