correct merge error

parent be0324b0
......@@ -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
......
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment