Addendum to the 5.1 merge of the fix
for bug 30377: use the function instead of the complex condition.
This commit is contained in:
parent
79e8747169
commit
d2bd51c55f
@ -1732,8 +1732,7 @@ mysql_execute_command(THD *thd)
|
||||
variables, but for now this is probably good enough.
|
||||
Don't reset warnings when executing a stored routine.
|
||||
*/
|
||||
if ((all_tables || &lex->select_lex != lex->all_selects_list ||
|
||||
lex->sroutines.records) && !thd->spcont)
|
||||
if ((all_tables || !lex->is_single_level_stmt()) && !thd->spcont)
|
||||
mysql_reset_errors(thd, 0);
|
||||
|
||||
#ifdef HAVE_REPLICATION
|
||||
|
Loading…
x
Reference in New Issue
Block a user