Merge 10.2 into bb-10.2-ext

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 */

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)
@@ -76,5 +76,4 @@ information_schema: MDEV-14372: unstable testcase
 ##
 
 mysqlbinlog_gtid_skip_empty_trans_rocksdb : MariaRocks: requires GTIDs
-rpl_row_triggers : MariaRocks: requires GTIDs