bzr commit into mysql-5.1-bugteam branch (sergey.glukhov:3533)

[Sergey Glukhov]

#At file:///home/gluh/MySQL/mysql-5.1-bugteam/ based on revid:sergey.glukhov@stripped

 3533 Sergey Glukhov	2010-12-21 [merge]
      automerge
     @ mysql-test/suite/rpl/r/rpl_do_grant.result
        automerge
     @ mysql-test/suite/rpl/t/rpl_do_grant.test
        automerge

    modified:
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/t/rpl_do_grant.test
=== modified file 'mysql-test/suite/rpl/r/rpl_do_grant.result'
--- a/mysql-test/suite/rpl/r/rpl_do_grant.result	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_do_grant.result	2010-12-21 12:09:38 +0000
@@ -162,7 +162,9 @@ USE bug42217_db;
 DROP FUNCTION upgrade_del_func;
 DROP FUNCTION upgrade_alter_func;
 DROP DATABASE bug42217_db;
+SET SQL_LOG_BIN= 0;
 DROP USER 'create_rout_db'@'localhost';
+SET SQL_LOG_BIN= 1;
 include/rpl_reset.inc
 USE test;
 ######## BUG#49119 #######

=== modified file 'mysql-test/suite/rpl/t/rpl_do_grant.test'
--- a/mysql-test/suite/rpl/t/rpl_do_grant.test	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_do_grant.test	2010-12-21 12:09:38 +0000
@@ -216,10 +216,10 @@ DROP DATABASE bug42217_db;
 -- connection master
 
 # user was already dropped in the slave before
-# so no need to wait for the slave to replicate
-# this statement (if it did and we later synced
-# the slave it would end up in an error anyway)
+# so we should not replicate this statement.
+SET SQL_LOG_BIN= 0;
 DROP USER 'create_rout_db'@'localhost';
+SET SQL_LOG_BIN= 1;
 
 # finish entire clean up (remove binlogs)
 # so that we leave a pristine environment for the

No bundle (reason: revision is a merge).