diff options
| author | unknown <mskold@mysql.com> | 2005-02-24 14:48:12 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-02-24 14:48:12 +0100 |
| commit | c7fefed4b88871b495bb893fcec8a9baabb2990c (patch) | |
| tree | 3224bd09c671895b0aa66ecf7654038bd32ee39f /sql/sql_parse.cc | |
| parent | 2b467d35e375bf0068b95e993146cd4c6b0c582e (diff) | |
| parent | 9d5d847835475f9195c0b9a3e83d2e9770f1b7b1 (diff) | |
| download | mariadb-git-c7fefed4b88871b495bb893fcec8a9baabb2990c.tar.gz | |
Merge
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 9a1b2eb0430..6e28f5bcefb 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4185,6 +4185,12 @@ unsent_create_error: thd->row_count_func= 0; res= sp->execute_procedure(thd, &lex->value_list); + /* If warnings have been cleared, we have to clear total_warn_count + * too, otherwise the clients get confused. + */ + if (thd->warn_list.is_empty()) + thd->total_warn_count= 0; + thd->variables.select_limit= select_limit; #ifndef NO_EMBEDDED_ACCESS_CHECKS sp_restore_security_context(thd, sp, &save_ctx); |