diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-28 09:29:14 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-29 19:18:11 +0300 |
| commit | 2ac8b1a90709f3484377aae72d4280ee9000e794 (patch) | |
| tree | a4986d1f9977b313c6f78e4bb16a24c2aa26a8e3 /storage/innobase/trx/trx0rseg.cc | |
| parent | 600c85e85a26f5c401223983f842fdaecdc4671e (diff) | |
| download | mariadb-git-2ac8b1a90709f3484377aae72d4280ee9000e794.tar.gz | |
MDEV-12266: Add fil_system.sys_space, temp_space
Add fil_system_t::sys_space, fil_system_t::temp_space.
These will replace lookups for TRX_SYS_SPACE or SRV_TMP_SPACE_ID.
mtr_t::m_undo_space, mtr_t::m_sys_space: Remove.
mtr_t::set_sys_modified(): Remove.
fil_space_get_type(), fil_space_get_n_reserved_extents(): Remove.
fsp_header_get_tablespace_size(), fsp_header_inc_size():
Merge to the only caller, innobase_start_or_create_for_mysql().
Diffstat (limited to 'storage/innobase/trx/trx0rseg.cc')
| -rw-r--r-- | storage/innobase/trx/trx0rseg.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/storage/innobase/trx/trx0rseg.cc b/storage/innobase/trx/trx0rseg.cc index 9a2d1d97875..c12f9b319fa 100644 --- a/storage/innobase/trx/trx0rseg.cc +++ b/storage/innobase/trx/trx0rseg.cc @@ -640,11 +640,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); -#ifdef UNIV_DEBUG - const fil_space_t* space = -#endif /* UNIV_DEBUG */ - mtr_x_lock_space(SRV_TMP_SPACE_ID, &mtr); - ut_ad(space->purpose == FIL_TYPE_TEMPORARY); + mtr_x_lock(&fil_system.temp_space->latch, &mtr); ulint page_no = trx_rseg_header_create( SRV_TMP_SPACE_ID, i, NULL, &mtr); |