1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Addendum to the 5.1 merge of the fix

Browse Source 
for bug 30377: use the function instead of
the complex condition.
This commit is contained in:
unknown 2007-08-29 12:39:42 +03:00
parent 79e8747169
commit d2bd51c55f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_parse.cc
View File

@ -1732,8 +1732,7 @@ mysql_execute_command(THD *thd)
variables, but for now this is probably good enough. variables, but for now this is probably good enough.
Don't reset warnings when executing a stored routine. Don't reset warnings when executing a stored routine.
*/ */
if ((all_tables || &lex->select_lex != lex->all_selects_list || if ((all_tables || !lex->is_single_level_stmt()) && !thd->spcont)
lex->sroutines.records) && !thd->spcont)
mysql_reset_errors(thd, 0); mysql_reset_errors(thd, 0);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION