diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 17:01:00 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 17:01:00 +0200 |
commit | a2fc36989e13c6f322fd22791f67e0d1275461d7 (patch) | |
tree | 9cba675c50883e2e45c61a94b631d8875d16ddf9 /storage/innobase/fsp | |
parent | 82da98556cf58f0fbb43c82e9c6ae1a887b6cf3d (diff) | |
parent | 74d648db12e100c628548fb2e5aa67de718bd1fb (diff) | |
download | mariadb-git-a2fc36989e13c6f322fd22791f67e0d1275461d7.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/fsp')
-rw-r--r-- | storage/innobase/fsp/fsp0fsp.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc index 6ef6764ebb4..f4a0c9e3461 100644 --- a/storage/innobase/fsp/fsp0fsp.cc +++ b/storage/innobase/fsp/fsp0fsp.cc @@ -1275,11 +1275,8 @@ fsp_page_create( } else { rw_lock_sx_lock(&block->lock); } - mutex_enter(&block->mutex); buf_block_buf_fix_inc(block, __FILE__, __LINE__); - - mutex_exit(&block->mutex); mtr_memo_push(init_mtr, block, rw_latch == RW_X_LATCH ? MTR_MEMO_PAGE_X_FIX : MTR_MEMO_PAGE_SX_FIX); |