summaryrefslogtreecommitdiff
path: root/sql/sql_error.cc
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2005-06-28 00:52:21 +0300
committerbell@sanja.is.com.ua <>2005-06-28 00:52:21 +0300
commitb49b5805ebfdc372f4177d336f437feb6012cd15 (patch)
treee01de16f7f8659e247e0b1c7ca6f202d8d507a8a /sql/sql_error.cc
parentec35d6bfca4e8477e9b2238f51de0eea6577e364 (diff)
downloadmariadb-git-b49b5805ebfdc372f4177d336f437feb6012cd15.tar.gz
abort storing query to query cache if warnings appeared (BUG#9414)
Diffstat (limited to 'sql/sql_error.cc')
-rw-r--r--sql/sql_error.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc
index a31e15d0745..b24d15b6e3b 100644
--- a/sql/sql_error.cc
+++ b/sql/sql_error.cc
@@ -108,6 +108,8 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
if (level == MYSQL_ERROR::WARN_LEVEL_NOTE && !(thd->options & OPTION_SQL_NOTES))
return(0);
+ query_cache_abort(&thd->net);
+
if (thd->query_id != thd->warn_id)
mysql_reset_errors(thd);