diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-03-12 18:29:31 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-03-12 18:29:54 +0000 |
| commit | 248e5d01a57d4d3783081112ce4852593dfe3742 (patch) | |
| tree | 9fcde6cae965f56cc667826a2387d83bf846f12c /sql/mysqld.cc | |
| parent | 5511e8ed5941e3b5a7687f87a1fb4fa75815ee7b (diff) | |
| download | mariadb-git-248e5d01a57d4d3783081112ce4852593dfe3742.tar.gz | |
MDEV-14581 Warning info not cleared when caching THD
In thread caching code, clear THD's warnings before reuse.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1cf15abebdc..6783231022c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2961,6 +2961,10 @@ 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) { |