summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2017-05-09 10:55:17 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2017-05-09 10:55:17 +0300
commitd0ce8704665c63005c599579ff86692f23240496 (patch)
tree3781b351f9c64106721887d2ba6e81e13af53887
parente8889c800223db6a9b9e6d02dcb09a97524a1f16 (diff)
downloadmariadb-git-d0ce8704665c63005c599579ff86692f23240496.tar.gz
MDEV-12735: Accidental revert of MDEV-6933
-rw-r--r--storage/innobase/lock/lock0wait.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/innobase/lock/lock0wait.cc b/storage/innobase/lock/lock0wait.cc
index 867e596bca2..30752706475 100644
--- a/storage/innobase/lock/lock0wait.cc
+++ b/storage/innobase/lock/lock0wait.cc
@@ -274,10 +274,6 @@ lock_wait_suspend_thread(
}
}
- /* Wake the lock timeout monitor thread, if it is suspended */
-
- os_event_set(lock_sys->timeout_event);
-
lock_wait_mutex_exit();
trx_mutex_exit(trx);