database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-17720 slave_ddl_exec_mode=IDEMPOTENT does not handle DROP DATABASE

Browse Source 
Relevant if exists flag are added for create database and drop database.
This commit is contained in:
Sachin
2018-12-19 16:33:00 +05:30
parent 7e606a2d5c
commit f16d4d4c6e
3 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/rpl/r/rpl_idempotency.result
View File

@ -67,6 +67,18 @@ a
-3 -3
1 1
include/check_slave_no_error.inc include/check_slave_no_error.inc
drop table t1, t2;
DROP TABLE t1, t2; DROP TABLE t1, t2;
include/check_slave_no_error.inc
create database d;
create database e;
create database d;
create database if not exists e;
include/check_slave_no_error.inc
drop database d;
drop database e;
drop database d;
drop database if exists e;
include/check_slave_no_error.inc
SET @@global.slave_exec_mode= @old_slave_exec_mode; SET @@global.slave_exec_mode= @old_slave_exec_mode;
include/rpl_end.inc include/rpl_end.inc

21
mysql-test/suite/rpl/t/rpl_idempotency.test
View File

@ -75,9 +75,30 @@ SELECT * FROM t1 ORDER BY a;
SELECT * FROM t2 ORDER BY a; SELECT * FROM t2 ORDER BY a;
--source include/check_slave_no_error.inc --source include/check_slave_no_error.inc
connection slave;
drop table t1, t2;
connection master; connection master;
DROP TABLE t1, t2; DROP TABLE t1, t2;
sync_slave_with_master; sync_slave_with_master;
--source include/check_slave_no_error.inc
create database d;
create database e;
connection master;
create database d;
create database if not exists e;
sync_slave_with_master;
--source include/check_slave_no_error.inc
drop database d;
drop database e;
connection master;
drop database d;
drop database if exists e;
sync_slave_with_master;
--source include/check_slave_no_error.inc
SET @@global.slave_exec_mode= @old_slave_exec_mode; SET @@global.slave_exec_mode= @old_slave_exec_mode;

6
sql/sql_parse.cc
View File

@ -3884,6 +3884,9 @@ end_with_restore_list:
my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0)); my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
break; break;
} }
if (slave_ddl_exec_mode_options == SLAVE_EXEC_MODE_IDEMPOTENT &&
!(lex->create_info.options & HA_LEX_CREATE_IF_NOT_EXISTS))
create_info.options|= HA_LEX_CREATE_IF_NOT_EXISTS;
} }
#endif #endif
if (check_access(thd, CREATE_ACL, lex->name.str, NULL, NULL, 1, 0)) if (check_access(thd, CREATE_ACL, lex->name.str, NULL, NULL, 1, 0))
@ -3915,6 +3918,9 @@ end_with_restore_list:
my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0)); my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
break; break;
} }
if (!thd->slave_expected_error &&
slave_ddl_exec_mode_options == SLAVE_EXEC_MODE_IDEMPOTENT)
lex->check_exists= 1;
} }
#endif #endif
if (check_access(thd, DROP_ACL, lex->name.str, NULL, NULL, 1, 0)) if (check_access(thd, DROP_ACL, lex->name.str, NULL, NULL, 1, 0))