Commit 6846f62c authored by unknown's avatar unknown
Browse files

after-merge fix

parent 2033175a

mysql-test/r/rpl_multi_query.result

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ n 
3

4

5

show binlog events from 95;

show binlog events from 96;

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	#	create database mysqltest

mysql-test/t/rpl_multi_query.test

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ sync_slave_with_master; 
select * from mysqltest.t1;

connection master;

--replace_column 2 # 5 #

show binlog events from 95;

show binlog events from 96;

drop database mysqltest;

sync_slave_with_master;