summaryrefslogtreecommitdiff
path: root/sql/debug_sync.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/debug_sync.cc')
-rw-r--r--sql/debug_sync.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
index 5e439839bca..1f3c86c5b67 100644
--- a/sql/debug_sync.cc
+++ b/sql/debug_sync.cc
@@ -734,11 +734,6 @@ static st_debug_sync_action *debug_sync_get_action(THD *thd,
static bool debug_sync_set_action(THD *thd, st_debug_sync_action *action)
{
- if(!thd)
- {
- return;
- }
-
st_debug_sync_control *ds_control= thd->debug_sync_control;
bool is_dsp_now= FALSE;
DBUG_ENTER("debug_sync_set_action");
@@ -1455,7 +1450,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
sig_wait, sig_glob, error));});
if (error == ETIMEDOUT || error == ETIME)
{
- push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+ push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
ER_DEBUG_SYNC_TIMEOUT, ER(ER_DEBUG_SYNC_TIMEOUT));
break;
}