diff options
| author | unknown <joreland@mysql.com> | 2005-02-24 20:57:32 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-24 20:57:32 +0100 |
| commit | 2f7fde4877b127e318b89ecf3ea9c5c9fefac86e (patch) | |
| tree | a914f76139555e36611d008dfdd6ddd07fd463c0 /sql/sql_parse.cc | |
| parent | 1c2ea24efa893d197e1dee68f08d8ce4c7f992b3 (diff) | |
| parent | c7fefed4b88871b495bb893fcec8a9baabb2990c (diff) | |
| download | mariadb-git-2f7fde4877b127e318b89ecf3ea9c5c9fefac86e.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.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 1e22d7c9f83..d767a74ae8f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4189,6 +4189,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); |