thread cache: cleanup DBUG state when caching a thread

this fixes 40 failures in mysql-test

thread cache: cleanup DBUG state when caching a thread
this fixes 40 failures in mysql-test
a75d2694 · Sergei Golubchik · 06b45564 · a75d2694
Commit a75d2694 authored Mar 23, 2016 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

sql/mysqld.cc sql/mysqld.cc +5 -0

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3014,6 +3014,11 @@ static bool cache_thread()
    PSI_THREAD_CALL(delete_current_thread)();
 #endif

+#ifndef DBUG_OFF
+    while (_db_is_pushed_())
+      _db_pop_();
+#endif
+
    set_timespec(abstime, THREAD_CACHE_TIMEOUT);
    while (!abort_loop && ! wake_thread && ! kill_cached_threads)
    {