diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-08-29 12:39:42 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-08-29 12:39:42 +0300 |
| commit | d2bd51c55f76e3f0fc6ad13f1dce091019eb7555 (patch) | |
| tree | 3f43956a7880803ab0254913fe437259325697ea /sql/sql_parse.cc | |
| parent | 79e87471699778216740757064dda0347cc4291a (diff) | |
| download | mariadb-git-d2bd51c55f76e3f0fc6ad13f1dce091019eb7555.tar.gz | |
Addendum to the 5.1 merge of the fix
for bug 30377: use the function instead of
the complex condition.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 2e4ce65f1c4..39f4998daf0 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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 |