From f5e158183cb72de5bfc1cc7a9b6864a85c6517fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 16 Jan 2018 07:46:51 +0200 Subject: [PATCH] Follow-up fix to MDEV-14441: Correct a misplaced condition btr_cur_update_in_place(): The call rw_lock_x_lock(ahi_latch) must of course be inside the if (ahi_latch) condition. This is a mistake that I made when backporting the fix-under-development from 10.3. --- storage/innobase/btr/btr0cur.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc index 2830a38fa4a..8146667f7c2 100644 --- a/storage/innobase/btr/btr0cur.cc +++ b/storage/innobase/btr/btr0cur.cc @@ -3711,9 +3711,9 @@ btr_cur_update_in_place( to this record */ btr_search_update_hash_on_delete(cursor); } - } - rw_lock_x_lock(ahi_latch); + rw_lock_x_lock(ahi_latch); + } assert_block_ahi_valid(block); #endif /* BTR_CUR_HASH_ADAPT */