Commit 6846f62c authored by unknown's avatar unknown

after-merge fix

parent 2033175a
...@@ -19,7 +19,7 @@ n ...@@ -19,7 +19,7 @@ n
3 3
4 4
5 5
show binlog events from 95; show binlog events from 96;
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 # Query 1 # drop database if exists mysqltest master-bin.000001 # Query 1 # drop database if exists mysqltest
master-bin.000001 # Query 1 # create database mysqltest master-bin.000001 # Query 1 # create database mysqltest
......
...@@ -24,6 +24,6 @@ sync_slave_with_master; ...@@ -24,6 +24,6 @@ sync_slave_with_master;
select * from mysqltest.t1; select * from mysqltest.t1;
connection master; connection master;
--replace_column 2 # 5 # --replace_column 2 # 5 #
show binlog events from 95; show binlog events from 96;
drop database mysqltest; drop database mysqltest;
sync_slave_with_master; sync_slave_with_master;
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