mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

correct merge error

Browse source
This commit is contained in:
tomas@poseidon.bredbandsbolaget.se 2008-02-14 00:02:25 +01:00
parent be0324b005
commit fe9ee5c7bf
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
--replace_result $start_pos <start_pos>
--replace_column 5 #
--replace_column 2 # 5 #
--eval show binlog events from $start_pos limit 1,1
--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;
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>

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;
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>