diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-21 15:36:49 +0300 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-21 15:36:49 +0300 |
| commit | 775ca464cebdf1f6d4f33f526a97e15f97718eb1 (patch) | |
| tree | 49b0c35c87abbbb24aee4c3f33615d9620d15d1a | |
| parent | 928f52e1c1dd1b365390b48d06ce2afdc23bcff0 (diff) | |
| parent | 8bbc7fa38052ae247fdae94ec7e3c65deb325a7c (diff) | |
| download | mariadb-git-775ca464cebdf1f6d4f33f526a97e15f97718eb1.tar.gz | |
automerge
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_do_grant.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_do_grant.test | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_do_grant.result b/mysql-test/suite/rpl/r/rpl_do_grant.result index 6545fe863ee..671af1dce58 100644 --- a/mysql-test/suite/rpl/r/rpl_do_grant.result +++ b/mysql-test/suite/rpl/r/rpl_do_grant.result @@ -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 ####### diff --git a/mysql-test/suite/rpl/t/rpl_do_grant.test b/mysql-test/suite/rpl/t/rpl_do_grant.test index 31a370f34e0..a39c3fb6375 100644 --- a/mysql-test/suite/rpl/t/rpl_do_grant.test +++ b/mysql-test/suite/rpl/t/rpl_do_grant.test @@ -208,10 +208,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 |