mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged fix for BUG#59084 from 5.1-bugteam to 5.5-bugfixing

Browse source
This commit is contained in:
Sven Sandberg 2010-12-21 13:14:22 +01:00
commit dc950cfbf0
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_do_grant.result
View file

@ -162,7 +162,9 @@ USE bug42217_db;
DROP FUNCTION upgrade_del_func; DROP FUNCTION upgrade_del_func;
DROP FUNCTION upgrade_alter_func; DROP FUNCTION upgrade_alter_func;
DROP DATABASE bug42217_db; DROP DATABASE bug42217_db;
SET SQL_LOG_BIN= 0;
DROP USER 'create_rout_db'@'localhost'; DROP USER 'create_rout_db'@'localhost';
SET SQL_LOG_BIN= 1;
include/rpl_reset.inc include/rpl_reset.inc
USE test; USE test;
######## BUG#49119 ####### ######## BUG#49119 #######

6
mysql-test/suite/rpl/t/rpl_do_grant.test
View file

@ -208,10 +208,10 @@ DROP DATABASE bug42217_db;
-- connection master -- connection master
# user was already dropped in the slave before # user was already dropped in the slave before
# so no need to wait for the slave to replicate # so we should not replicate this statement.
# this statement (if it did and we later synced SET SQL_LOG_BIN= 0;
# the slave it would end up in an error anyway)
DROP USER 'create_rout_db'@'localhost'; DROP USER 'create_rout_db'@'localhost';
SET SQL_LOG_BIN= 1;
# finish entire clean up (remove binlogs) # finish entire clean up (remove binlogs)
# so that we leave a pristine environment for the # so that we leave a pristine environment for the