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

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2015-03-07 13:21:02 +01:00
parent 143f5d9172 d61573d3e5
commit 2db62f686e
728 changed files with 54975 additions and 9803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_parse.cc
View File

@ -2491,11 +2491,15 @@ mysql_execute_command(THD *thd)
according to slave filtering rules.
Returning success without producing any errors in this case.
*/
DBUG_RETURN(0);
if (!thd->lex->create_info.if_exists())
DBUG_RETURN(0);
/*
DROP TRIGGER IF NOT EXISTS will return without an error later
after possibly writing the query to a binlog
*/
}
// force searching in slave.cc:tables_ok()
all_tables->updating= 1;
else // force searching in slave.cc:tables_ok()
all_tables->updating= 1;
}
/*