bk commit into 5.0 tree (mkindahl:1.2574)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.0 repository of mkindahl.  When mkindahl does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-04 12:22:37+01:00, mkindahl@stripped +1 -0
  Fixes to make rpl_user test pass in pushbuild.

  mysql-test/t/rpl_user.test@stripped, 2008-02-04 12:22:28+01:00, mkindahl@stripped +9
-3
    Removing redundant reset master and deleting users from master
    and slave without using binary log.

diff -Nrup a/mysql-test/t/rpl_user.test b/mysql-test/t/rpl_user.test
--- a/mysql-test/t/rpl_user.test	2008-01-25 08:02:24 +01:00
+++ b/mysql-test/t/rpl_user.test	2008-02-04 12:22:28 +01:00
@@ -2,13 +2,19 @@
 
 --source include/master-slave.inc
 
-reset master;
-
 #
 # remove all users will be used in the test
 #
+connection master;
+set sql_log_bin=0;
+delete from mysql.user where Host='fakehost';
+set sql_log_bin=1;
+
+connection slave;
+set sql_log_bin=0;
 delete from mysql.user where Host='fakehost';
-sync_slave_with_master;
+set sql_log_bin=1;
+
 
 #
 # Test create user