database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Fix Merge Error

Browse Source
This commit is contained in:
Sachin Setiya
2017-08-23 16:49:42 +05:30
parent 0aeff8c36a
commit 5077cc0b1a
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -4225,7 +4225,7 @@ end_with_restore_list:
*/
if (thd->slave_thread && !thd->slave_expected_error &&
slave_ddl_exec_mode_options == SLAVE_EXEC_MODE_IDEMPOTENT)
lex->check_exists= 1;
lex->create_info.set(DDL_options_st::OPT_IF_EXISTS);
if (WSREP(thd))
{