diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-05-28 10:26:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-05-28 10:26:08 +0400 |
| commit | d1d6fe9abf6dc11745ee4432ab97a46cbb244bf5 (patch) | |
| tree | 59b4f50b1627ff5c07c48490142ede8c9cd3ae18 /sql/debug_sync.cc | |
| parent | c0cd662b986c378d536cff511ba7ba342fcd7012 (diff) | |
| download | mariadb-git-d1d6fe9abf6dc11745ee4432ab97a46cbb244bf5.tar.gz | |
Using more of Sql_mode_save. Adding a similar class for THD::abort_on_warnings.
Diffstat (limited to 'sql/debug_sync.cc')
| -rw-r--r-- | sql/debug_sync.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc index bf721bddb85..19ea40106df 100644 --- a/sql/debug_sync.cc +++ b/sql/debug_sync.cc @@ -1451,12 +1451,10 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action) if (unlikely(error == ETIMEDOUT || error == ETIME)) { // We should not make the statement fail, even if in strict mode. - const bool save_abort_on_warning= thd->abort_on_warning; - thd->abort_on_warning= false; + Abort_on_warning_instant_set aws(thd, false); push_warning(thd, Sql_condition::WARN_LEVEL_WARN, ER_DEBUG_SYNC_TIMEOUT, ER_THD(thd, ER_DEBUG_SYNC_TIMEOUT)); - thd->abort_on_warning= save_abort_on_warning; DBUG_EXECUTE_IF("debug_sync_abort_on_timeout", DBUG_ASSERT(0);); break; } |