1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG 53621: automerged bzr bundle from bug report.

Browse Source
This commit is contained in:
Luis Soares 2010-05-20 00:52:03 +01:00
commit 7e889a8dc9
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/rpl/r/rpl_do_grant.result
View File

@ -89,6 +89,7 @@ show grants for rpl_do_grant2@localhost;
ERROR 42000: There is no such grant defined for user 'rpl_do_grant2' on host 'localhost' ERROR 42000: There is no such grant defined for user 'rpl_do_grant2' on host 'localhost'
show grants for rpl_do_grant2@localhost; show grants for rpl_do_grant2@localhost;
ERROR 42000: There is no such grant defined for user 'rpl_do_grant2' on host 'localhost' ERROR 42000: There is no such grant defined for user 'rpl_do_grant2' on host 'localhost'
call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396");
DROP DATABASE IF EXISTS bug42217_db; DROP DATABASE IF EXISTS bug42217_db;
CREATE DATABASE bug42217_db; CREATE DATABASE bug42217_db;
GRANT CREATE ROUTINE ON bug42217_db.* TO 'create_rout_db'@'localhost' GRANT CREATE ROUTINE ON bug42217_db.* TO 'create_rout_db'@'localhost'
@ -166,9 +167,12 @@ DROP FUNCTION upgrade_del_func;
DROP FUNCTION upgrade_alter_func; DROP FUNCTION upgrade_alter_func;
DROP DATABASE bug42217_db; DROP DATABASE bug42217_db;
DROP USER 'create_rout_db'@'localhost'; DROP USER 'create_rout_db'@'localhost';
call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396"); stop slave;
USE mtr; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396"); reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
######## BUG#49119 ####### ######## BUG#49119 #######
### i) test case from the 'how to repeat section' ### i) test case from the 'how to repeat section'
stop slave; stop slave;

18
mysql-test/suite/rpl/t/rpl_do_grant.test
View File

@ -120,6 +120,9 @@ show grants for rpl_do_grant2@localhost;
# BUG42217 mysql.procs_priv does not get replicated # BUG42217 mysql.procs_priv does not get replicated
##################################################### #####################################################
connection master; connection master;
call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396");
sync_slave_with_master;
connection master;
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS bug42217_db; DROP DATABASE IF EXISTS bug42217_db;
@ -209,12 +212,19 @@ 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;
-- sync_slave_with_master
-- 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)
DROP USER 'create_rout_db'@'localhost'; DROP USER 'create_rout_db'@'localhost';
call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396"); # finish entire clean up (remove binlogs)
connection slave; # so that we leave a pristine environment for the
USE mtr; # following tests
call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396"); -- source include/master-slave-reset.inc
# BUG#49119: Master crashes when executing 'REVOKE ... ON # BUG#49119: Master crashes when executing 'REVOKE ... ON
# {PROCEDURE|FUNCTION} FROM ...' # {PROCEDURE|FUNCTION} FROM ...'

1
mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
View File

@ -10,4 +10,5 @@ source include/have_binlog_format_row.inc;
LET $ENGINE_TYPE= MyISAM; LET $ENGINE_TYPE= MyISAM;
source extra/rpl_tests/rpl_tmp_table_and_DDL.test; source extra/rpl_tests/rpl_tmp_table_and_DDL.test;
sync_slave_with_master;