diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-16 07:51:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-16 07:51:02 +0200 |
| commit | 822f4e6c1007a3ad4fbd7c3b340ea561566a6b6a (patch) | |
| tree | 473c7cf9213b90b547e319fc7a29c76672c5374d | |
| parent | e2e740030d4f027e25f9a322990af0fdb3e0ffc3 (diff) | |
| parent | f5e158183cb72de5bfc1cc7a9b6864a85c6517fd (diff) | |
| download | mariadb-git-822f4e6c1007a3ad4fbd7c3b340ea561566a6b6a.tar.gz | |
Merge 10.2 into bb-10.2-ext
| -rw-r--r-- | storage/innobase/btr/btr0cur.cc | 4 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/disabled.def | 3 |
2 files changed, 3 insertions, 4 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 */ diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def index 8d0b5693a5b..3b9726986f0 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) @@ -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 |