diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-14 13:23:36 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-14 13:23:36 +0200 |
| commit | 89ae01fd0085cf0d1af272eca545e49fdadf4538 (patch) | |
| tree | ad603636552ceab2ce34d6017d5ac78b0202842d /storage/innobase/trx | |
| parent | 746ee78535705984f564d35474b8ffc0be7cea81 (diff) | |
| parent | 3d4a80153345209bad736235d4f66dcaa51a9d51 (diff) | |
| download | mariadb-git-89ae01fd0085cf0d1af272eca545e49fdadf4538.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0purge.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0rseg.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0sys.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc index f1abf4061d8..39035dc545e 100644 --- a/storage/innobase/trx/trx0purge.cc +++ b/storage/innobase/trx/trx0purge.cc @@ -697,7 +697,7 @@ not_free: mtr_t mtr; const ulint size = SRV_UNDO_TABLESPACE_SIZE_IN_PAGES; mtr.start(); - mtr_x_lock(&purge_sys.truncate.current->latch, &mtr); + mtr_x_lock_space(purge_sys.truncate.current, &mtr); fil_truncate_log(purge_sys.truncate.current, size, &mtr); fsp_header_init(purge_sys.truncate.current, size, &mtr); mutex_enter(&fil_system.mutex); diff --git a/storage/innobase/trx/trx0rseg.cc b/storage/innobase/trx/trx0rseg.cc index ef4732a98af..29e6acc773c 100644 --- a/storage/innobase/trx/trx0rseg.cc +++ b/storage/innobase/trx/trx0rseg.cc @@ -696,7 +696,7 @@ trx_temp_rseg_create() for (ulong i = 0; i < TRX_SYS_N_RSEGS; i++) { mtr.start(); mtr.set_log_mode(MTR_LOG_NO_REDO); - mtr_x_lock(&fil_system.temp_space->latch, &mtr); + mtr_x_lock_space(fil_system.temp_space, &mtr); buf_block_t* rblock = trx_rseg_header_create( fil_system.temp_space, i, NULL, &mtr); diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc index bb645186b75..e1d72f14e3a 100644 --- a/storage/innobase/trx/trx0sys.cc +++ b/storage/innobase/trx/trx0sys.cc @@ -156,7 +156,7 @@ trx_sysf_create( then enter the kernel: we must do it in this order to conform to the latching order rules. */ - mtr_x_lock(&fil_system.sys_space->latch, mtr); + mtr_x_lock_space(fil_system.sys_space, mtr); compile_time_assert(TRX_SYS_SPACE == 0); /* Create the trx sys file block in a new allocated file segment */ |