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 tag 'mariadb-10.0.17' into 10.0-galera

Browse Source 
Conflicts:
	storage/innobase/include/trx0trx.h
This commit is contained in:
Nirbhay Choubey
2015-02-27 17:36:54 -05:00
parent f02fdb6b55 5c66abf0b0
commit af651c80f7
584 changed files with 50432 additions and 8938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_parse.cc
View File

@ -2499,11 +2499,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->check_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;
}
/*