summaryrefslogtreecommitdiff
path: root/storage/innobase/handler/ha_innodb.cc
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/handler/ha_innodb.cc')
-rw-r--r--storage/innobase/handler/ha_innodb.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 84d7b1a12c8..df448e85da9 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -4467,7 +4467,7 @@ innobase_kill_query(
THD *owner = trx->current_lock_mutex_owner;
/* Cancel a pending lock request. */
- if (owner != cur) {
+ if (!owner || owner != cur) {
lock_mutex_enter();
}
trx_mutex_enter(trx);
@@ -4475,7 +4475,7 @@ innobase_kill_query(
lock_cancel_waiting_and_release(trx->lock.wait_lock);
}
trx_mutex_exit(trx);
- if (owner != cur) {
+ if (!owner || owner != cur) {
lock_mutex_exit();
}
}