diff options
author | Sven Sandberg <sven.sandberg@oracle.com> | 2010-12-19 18:15:12 +0100 |
---|---|---|
committer | Sven Sandberg <sven.sandberg@oracle.com> | 2010-12-19 18:15:12 +0100 |
commit | 1bd213aec31f4c2de242a7fe1baf2373e79bda7d (patch) | |
tree | 91a12675003778cd8ccbccea5ce47ee09fc46efc /mysql-test/suite/rpl/r/rpl_temporary.result | |
parent | a3cc81fa70e71dd9a40be3c5477eb7a6e8ec4974 (diff) | |
parent | 8b27f9a05e2f49191b57b8717a31753573981fe7 (diff) | |
download | mariadb-git-1bd213aec31f4c2de242a7fe1baf2373e79bda7d.tar.gz |
Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_temporary.result')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_temporary.result | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_temporary.result b/mysql-test/suite/rpl/r/rpl_temporary.result index bceece8d682..dfab66d074f 100644 --- a/mysql-test/suite/rpl/r/rpl_temporary.result +++ b/mysql-test/suite/rpl/r/rpl_temporary.result @@ -1,9 +1,5 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; +include/master-slave.inc +[connection master] call mtr.add_suppression("Slave: Can\'t find record in \'user\' Error_code: 1032"); reset master; DROP TABLE IF EXISTS t1; @@ -129,6 +125,8 @@ select * from t1; a 1 drop table t1; +include/stop_slave.inc +include/rpl_reset.inc -- Bug#43748 -- make a user on the slave that can list but not kill system threads. FLUSH PRIVILEGES; @@ -140,5 +138,5 @@ KILL @id; Got one of the listed errors -- throw out test-user on slave. DROP USER user43748@127.0.0.1; --- done. back to master. End of 5.1 tests +include/rpl_end.inc |