Commit 5b1afb9b authored by Davi Arnaut's avatar Davi Arnaut

Remove usage of the _db_strict_keyword_ in favor of the more reliable

DBUG_EXECUTE_IF macro. The usage of the former caused breakage in other
trees as it got removed from the dbug library.

sql/sql_base.cc:
  Rework code to remove unreliable usage of _db_script_keyword_.
parent 7adf7154
......@@ -3720,6 +3720,18 @@ void assign_new_table_id(TABLE_SHARE *share)
DBUG_VOID_RETURN;
}
/* Cause a spurious statement reprepare for debug purposes. */
static inline bool inject_reprepare(THD *thd)
{
if (thd->m_reprepare_observer && thd->stmt_arena->is_reprepared == FALSE)
{
thd->m_reprepare_observer->report_error(thd);
return TRUE;
}
return FALSE;
}
/**
Compare metadata versions of an element obtained from the table
definition cache and its corresponding node in the parse tree.
......@@ -3773,15 +3785,7 @@ check_and_update_table_version(THD *thd,
tables->set_table_ref_id(table_share);
}
#ifndef DBUG_OFF
/* Spuriously reprepare each statement. */
if (_db_strict_keyword_("reprepare_each_statement") &&
thd->m_reprepare_observer && thd->stmt_arena->is_reprepared == FALSE)
{
thd->m_reprepare_observer->report_error(thd);
return TRUE;
}
#endif
DBUG_EXECUTE_IF("reprepare_each_statement", return inject_reprepare(thd););
return FALSE;
}
......
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