Commit fa2cac5f authored by Mattias Jonsson's avatar Mattias Jonsson

Additional fix for DEBUG_SYNC which failed for some rpl-tests,

due to DBUG_ASSERT. (added in bug#50561)

sql/sql_base.cc:
  DEBUG_SYNC asserts that thd->debug_sync_control is set.
parent 5a21306e
...@@ -1244,7 +1244,12 @@ void close_thread_tables(THD *thd) ...@@ -1244,7 +1244,12 @@ void close_thread_tables(THD *thd)
table->s->table_name.str, (long) table)); table->s->table_name.str, (long) table));
#endif #endif
DEBUG_SYNC(thd, "before_close_thread_tables"); #if defined(ENABLED_DEBUG_SYNC)
/* debug_sync may not be initialized for some slave threads */
if (thd->debug_sync_control)
DEBUG_SYNC(thd, "before_close_thread_tables");
#endif
/* /*
We are assuming here that thd->derived_tables contains ONLY derived We are assuming here that thd->derived_tables contains ONLY derived
tables for this substatement. i.e. instead of approach which uses tables for this substatement. i.e. instead of approach which uses
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment