Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
mariadb
Commits
e23f8e80
Commit
e23f8e80
authored
15 years ago
by
Luis Soares
Browse files
Options
Download
Plain Diff
Automerge from mysql-trunk-bugfixing.
parents
744e026a
b074aa64
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
7 deletions
+22
-7
mysql-test/suite/rpl/r/rpl_do_grant.result
mysql-test/suite/rpl/r/rpl_do_grant.result
+7
-3
mysql-test/suite/rpl/t/rpl_do_grant.test
mysql-test/suite/rpl/t/rpl_do_grant.test
+14
-4
mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
+1
-0
No files found.
mysql-test/suite/rpl/r/rpl_do_grant.result
View file @
e23f8e80
...
...
@@ -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'
show grants for rpl_do_grant2@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;
CREATE DATABASE bug42217_db;
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 DATABASE bug42217_db;
DROP USER 'create_rout_db'@'localhost';
call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396");
USE mtr;
call mtr.add_suppression("Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396");
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;
######## BUG#49119 #######
### i) test case from the 'how to repeat section'
stop slave;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/rpl/t/rpl_do_grant.test
View file @
e23f8e80
...
...
@@ -112,6 +112,9 @@ show grants for rpl_do_grant2@localhost;
# BUG42217 mysql.procs_priv does not get replicated
#####################################################
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
DROP
DATABASE
IF
EXISTS
bug42217_db
;
...
...
@@ -201,12 +204,19 @@ USE bug42217_db;
DROP
FUNCTION
upgrade_del_func
;
DROP
FUNCTION
upgrade_alter_func
;
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'
;
call
mtr
.
add_suppression
(
"Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396"
);
connection
slave
;
USE
mtr
;
call
mtr
.
add_suppression
(
"Slave: Operation DROP USER failed for 'create_rout_db'@'localhost' Error_code: 1396"
);
# finish entire clean up (remove binlogs)
# so that we leave a pristine environment for the
# following tests
--
source
include
/
master
-
slave
-
reset
.
inc
# BUG#49119: Master crashes when executing 'REVOKE ... ON
# {PROCEDURE|FUNCTION} FROM ...'
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
View file @
e23f8e80
...
...
@@ -10,4 +10,5 @@ source include/have_binlog_format_row.inc;
LET
$ENGINE_TYPE
=
MyISAM
;
source
extra
/
rpl_tests
/
rpl_tmp_table_and_DDL
.
test
;
sync_slave_with_master
;
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment