Fixes to make tests pass on pushbuild.

mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt:
  Rename: mysql-test/t/rpl_loaddata_map-master.opt -> mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt
mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt:
  Rename: mysql-test/t/rpl_loaddata_map-slave.opt -> mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt
mysql-test/include/show_binlog_events2.inc:
  Binlog position change.
mysql-test/suite/rpl/r/rpl_loaddata_map.result:
  Result change.
mysql-test/suite/rpl/r/rpl_user.result:
  Result change.
mysql-test/suite/rpl/t/rpl_loaddata_map.test:
  Test is only sensible to execute for statement and mixed mode.
mysql-test/suite/rpl/t/rpl_user.test:
  Test assumed that binary log is identical for row- and statement-
  based logging, which it was not. Deleting users individually
  on master and slave respectively, without involving binary
  log.

7 files changed, 27 insertions, 17 deletions

diff --git a/mysql-test/include/show_binlog_events2.inc b/mysql-test/include/show_binlog_events2.inc
index fa244c5a5a3..5dd272c562d 100644
--- a/mysql-test/include/show_binlog_events2.inc
+++ b/mysql-test/include/show_binlog_events2.inc
@@ -1,4 +1,4 @@
---let $binlog_start=98
+--let $binlog_start=106
 --replace_result $binlog_start <binlog_start>
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
diff --git a/mysql-test/r/rpl_loaddata_map.result b/mysql-test/suite/rpl/r/rpl_loaddata_map.result
index c2159adef6a..e6ddc1ebedc 100644
--- a/mysql-test/r/rpl_loaddata_map.result
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_map.result
@@ -12,13 +12,13 @@ load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
 select count(*) from t2 /* 5 000 */;
 count(*)
 5000
-show binlog events in 'master-bin.000002' from 98;
+show binlog events in 'master-bin.000002' from 106;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000002	98	Query	1	#	use `test`; create table t2 (id int not null primary key auto_increment)
-master-bin.000002	221	Begin_load_query	1	#	;file_id=#;block_len=8192
-master-bin.000002	8436	Append_block	1	#	;file_id=#;block_len=8192
-master-bin.000002	16651	Append_block	1	#	;file_id=#;block_len=7509
-master-bin.000002	24183	Execute_load_query	1	#	use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=#
+master-bin.000002	106	Query	1	#	use `test`; create table t2 (id int not null primary key auto_increment)
+master-bin.000002	229	Begin_load_query	1	#	;file_id=#;block_len=8192
+master-bin.000002	8444	Append_block	1	#	;file_id=#;block_len=8192
+master-bin.000002	16659	Append_block	1	#	;file_id=#;block_len=7509
+master-bin.000002	24191	Execute_load_query	1	#	use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=#
 select count(*) from t2 /* 5 000 */;
 count(*)
 5000
diff --git a/mysql-test/r/rpl_user.result b/mysql-test/suite/rpl/r/rpl_user.result
index 475579e7d33..944a1b4d6ea 100644
--- a/mysql-test/r/rpl_user.result
+++ b/mysql-test/suite/rpl/r/rpl_user.result
@@ -5,7 +5,12 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 reset master;
+set session sql_log_bin=0;
 delete from mysql.user where Host='fakehost';
+set session sql_log_bin=1;
+set session sql_log_bin=0;
+delete from mysql.user where Host='fakehost';
+set session sql_log_bin=1;
 create user 'foo'@'fakehost';
 create user 'foo'@'fakehost', 'bar'@'fakehost';
 ERROR HY000: Operation CREATE USER failed for 'foo'@'fakehost'
@@ -31,12 +36,11 @@ drop user 'not_exist_user1'@'fakehost', 'not_exist_user2'@'fakehost';
 ERROR HY000: Operation DROP USER failed for 'not_exist_user1'@'fakehost','not_exist_user2'@'fakehost'
 select Host,User from mysql.user where Host='fakehost';
 Host	User
-show binlog events from 98;
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	98	Query	1	#	use `test`; delete from mysql.user where Host='fakehost'
-master-bin.000001	205	Query	1	#	use `test`; create user 'foo'@'fakehost'
-master-bin.000001	296	Query	1	#	use `test`; create user 'foo'@'fakehost', 'bar'@'fakehost'
-master-bin.000001	405	Query	1	#	use `test`; rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'
-master-bin.000001	519	Query	1	#	use `test`; rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'
-master-bin.000001	686	Query	1	#	use `test`; drop user 'foofoo'@'fakehost'
-master-bin.000001	778	Query	1	#	use `test`; drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost'
+master-bin.000001	#	Query	#	#	use `test`; create user 'foo'@'fakehost'
+master-bin.000001	#	Query	#	#	use `test`; create user 'foo'@'fakehost', 'bar'@'fakehost'
+master-bin.000001	#	Query	#	#	use `test`; rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'
+master-bin.000001	#	Query	#	#	use `test`; rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'
+master-bin.000001	#	Query	#	#	use `test`; drop user 'foofoo'@'fakehost'
+master-bin.000001	#	Query	#	#	use `test`; drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost'
diff --git a/mysql-test/t/rpl_loaddata_map-master.opt b/mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt
index f3c797b19c8..f3c797b19c8 100644
--- a/mysql-test/t/rpl_loaddata_map-master.opt
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt
diff --git a/mysql-test/t/rpl_loaddata_map-slave.opt b/mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt
index 95f55bcf7d8..95f55bcf7d8 100644
--- a/mysql-test/t/rpl_loaddata_map-slave.opt
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt
diff --git a/mysql-test/t/rpl_loaddata_map.test b/mysql-test/suite/rpl/t/rpl_loaddata_map.test
index 0a2883bfcca..3d6f09844b6 100644
--- a/mysql-test/t/rpl_loaddata_map.test
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_map.test
@@ -9,6 +9,7 @@
 
 source include/master-slave.inc;
 source include/have_innodb.inc;
+source include/have_binlog_format_mixed_or_statement.inc;
 
 --disable_query_log
 let $rows= 5000;
@@ -33,7 +34,7 @@ eval load data infile '$MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
 select count(*) from t2 /* 5 000 */;
 
 # the binglog will show fragmented Append_block events
---let $binlog_start=98
+--let $binlog_start=106
 --replace_column 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /file_id=[0-9]+/file_id=#/
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
diff --git a/mysql-test/t/rpl_user.test b/mysql-test/suite/rpl/t/rpl_user.test
index 8c85b1e9249..dbfb5d6e65d 100644
--- a/mysql-test/t/rpl_user.test
+++ b/mysql-test/suite/rpl/t/rpl_user.test
@@ -7,8 +7,13 @@ reset master;
 #
 # remove all users will be used in the test
 #
+set session sql_log_bin=0; 
 delete from mysql.user where Host='fakehost';
-sync_slave_with_master;
+set session sql_log_bin=1; 
+connection slave;
+set session sql_log_bin=0; 
+delete from mysql.user where Host='fakehost';
+set session sql_log_bin=1; 
 
 #
 # Test create user