summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
Diffstat (limited to 'mysys')
-rw-r--r--mysys/thr_lock.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 926951b7443..c3a99d78d25 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -483,7 +483,7 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data,
struct timespec wait_timeout;
enum enum_thr_lock_result result= THR_LOCK_ABORTED;
const char *old_proc_info;
- my_bool use_wait_callbacks;
+ my_bool use_wait_callbacks= FALSE;
DBUG_ENTER("wait_for_lock");
/*
@@ -540,8 +540,6 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data,
use_wait_callbacks= TRUE;
(*before_lock_wait)();
}
- else
- use_wait_callbacks= FALSE;
set_timespec(wait_timeout, lock_wait_timeout);
while (!thread_var->abort || in_wait_list)