From 0292cd0a27418fabe4660fa6f2a92a0952b06826 Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Mon, 15 Jan 2018 21:08:00 +0300 Subject: [PATCH 1/2] Better explanation why rpl_row_triggers is disabled. --- storage/rocksdb/mysql-test/rocksdb/t/disabled.def | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def index c2ca6efe46c..60f658ec7e1 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def +++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def @@ -59,7 +59,7 @@ bytes_written: Needs I_S.TABLE_STATISTICS.IO_WRITE_BYTES trx_info_rpl : MariaRocks: @@rpl_skip_tx_api doesn't work, yet. rpl_read_free: MDEV-10976 lock_wait_timeout_stats: MDEV-13404 - +rpl_row_triggers : Requires read-free slave. ## ## Test failures (in buildbot or else where) @@ -74,5 +74,4 @@ information_schema: MDEV-14372: unstable testcase ## mysqlbinlog_gtid_skip_empty_trans_rocksdb : MariaRocks: requires GTIDs -rpl_row_triggers : MariaRocks: requires GTIDs 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 2/2] 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 */