Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/t/rpl_user.test:
  Manual merging.

mysql-test/suite/rpl/t/rpl_user.test

@@ -2,14 +2,14 @@
 
 --source include/master-slave.inc
 
-reset master;
-
 #
 # remove all users will be used in the test
 #
+connection master;
 set session sql_log_bin=0; 
 delete from mysql.user where Host='fakehost';
 set session sql_log_bin=1; 
+
 connection slave;
 set session sql_log_bin=0; 
 delete from mysql.user where Host='fakehost';