after-merge fix

b68514dd · serg@serg.mylan · 262dd182 · b68514dd · b68514dd
Commit b68514dd authored Feb 18, 2005 by serg@serg.mylan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/rpl_multi_query.result mysql-test/r/rpl_multi_query.result +1 -1

mysql-test/t/rpl_multi_query.test mysql-test/t/rpl_multi_query.test +1 -1

No files found.
--- a/mysql-test/r/rpl_multi_query.result
+++ b/mysql-test/r/rpl_multi_query.result
@@ -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

--- a/mysql-test/t/rpl_multi_query.test
+++ b/mysql-test/t/rpl_multi_query.test
@@ -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;