From 24fdba78be51c16085bfc4be83d56ffde5d3a04c Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 14 Feb 2008 00:02:25 +0100 Subject: [PATCH] correct merge error --- mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test | 2 +- mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result | 2 +- mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test b/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test index b9abf022804..4677f6da25d 100644 --- a/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test +++ b/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test @@ -64,7 +64,7 @@ connection master; --echo # Now the insert, one step after --echo --replace_result $start_pos ---replace_column 5 # +--replace_column 2 # 5 # --eval show binlog events from $start_pos limit 1,1 --echo diff --git a/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result b/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result index 36f77a17e62..eba1222ea33 100644 --- a/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result +++ b/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result @@ -34,7 +34,7 @@ master-bin.000001 Query 1 # use `test`; BEGIN show binlog events from limit 1,1; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 397 Query 1 # use `test`; insert into t1 values (1,2) +master-bin.000001 # Query 1 # use `test`; insert into t1 values (1,2) # and the COMMIT should be at diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result index 7d8972cfbf2..db9920dd79f 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result @@ -34,7 +34,7 @@ master-bin.000001 Query 1 # use `test`; BEGIN show binlog events from limit 1,1; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 396 Query 1 # use `test`; insert into t1 values (1,2) +master-bin.000001 # Query 1 # use `test`; insert into t1 values (1,2) # and the COMMIT should be at