summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-10-09 09:11:30 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-10-09 09:11:30 +0300
commit43ee6915fa4b8e3088e89b7d4325946190ce04f5 (patch)
treee580d22b0ff6faed1720f88ddeedf86a0867fa41 /sql/mysqld.cc
parent7d4beb7286d53be07ff552de9d37ea90c2762651 (diff)
parent1ebe841fb85725c2a6aaecb3bca41ec098a5193d (diff)
downloadmariadb-git-43ee6915fa4b8e3088e89b7d4325946190ce04f5.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e4866f516ff..f024edae0d3 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2992,10 +2992,6 @@ static bool cache_thread(THD *thd)
_db_pop_();
#endif
- /* Clear warnings. */
- if (!thd->get_stmt_da()->is_warning_info_empty())
- thd->get_stmt_da()->clear_warning_info(thd->query_id);
-
set_timespec(abstime, THREAD_CACHE_TIMEOUT);
while (!abort_loop && ! wake_thread && ! kill_cached_threads)
{