1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correct merge error

Browse Source
This commit is contained in:
unknown 2008-02-14 00:02:25 +01:00
parent 9ab7ecc43a
commit 24fdba78be
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
View File

@ -64,7 +64,7 @@ connection master;
--echo # Now the insert, one step after --echo # Now the insert, one step after
--echo --echo
--replace_result $start_pos <start_pos> --replace_result $start_pos <start_pos>
--replace_column 5 # --replace_column 2 # 5 #
--eval show binlog events from $start_pos limit 1,1 --eval show binlog events from $start_pos limit 1,1
--echo --echo

2
mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
View File

@ -34,7 +34,7 @@ master-bin.000001 <start_pos> Query 1 # use `test`; BEGIN
show binlog events from <start_pos> limit 1,1; show binlog events from <start_pos> limit 1,1;
Log_name Pos Event_type Server_id End_log_pos Info 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 <end_pos> # and the COMMIT should be at <end_pos>

2
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
View File

@ -34,7 +34,7 @@ master-bin.000001 <start_pos> Query 1 # use `test`; BEGIN
show binlog events from <start_pos> limit 1,1; show binlog events from <start_pos> limit 1,1;
Log_name Pos Event_type Server_id End_log_pos Info 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 <end_pos> # and the COMMIT should be at <end_pos>