diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-09 13:06:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-09 13:06:46 +0300 |
| commit | 7e07e38cf687ccd7fa3bd3a35c1eb7e4b307ca5f (patch) | |
| tree | 5bbdf4ba99c33d6fb16f360d07e5d0c41be743bc /storage/innobase/trx | |
| parent | e976f461d8c0e11a12453fa96f732a447b84420c (diff) | |
| parent | 0eb38243ce09691cf46dd5fb875c1a1a1b75aff2 (diff) | |
| download | mariadb-git-7e07e38cf687ccd7fa3bd3a35c1eb7e4b307ca5f.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0rseg.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0sys.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0undo.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/trx/trx0rseg.cc b/storage/innobase/trx/trx0rseg.cc index 60279935900..dfc8e5cbcca 100644 --- a/storage/innobase/trx/trx0rseg.cc +++ b/storage/innobase/trx/trx0rseg.cc @@ -303,7 +303,7 @@ trx_rseg_header_create( ut_ad(!sys_header == (space == fil_system.temp_space)); /* Allocate a new file segment for the rollback segment */ - block = fseg_create(space, 0, TRX_RSEG + TRX_RSEG_FSEG_HEADER, mtr); + block = fseg_create(space, TRX_RSEG + TRX_RSEG_FSEG_HEADER, mtr); if (block == NULL) { /* No space left */ diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc index f1cc3f7c222..1bdb3727263 100644 --- a/storage/innobase/trx/trx0sys.cc +++ b/storage/innobase/trx/trx0sys.cc @@ -160,7 +160,7 @@ trx_sysf_create( compile_time_assert(TRX_SYS_SPACE == 0); /* Create the trx sys file block in a new allocated file segment */ - block = fseg_create(fil_system.sys_space, 0, + block = fseg_create(fil_system.sys_space, TRX_SYS + TRX_SYS_FSEG_HEADER, mtr); buf_block_dbg_add_level(block, SYNC_TRX_SYS_HEADER); diff --git a/storage/innobase/trx/trx0undo.cc b/storage/innobase/trx/trx0undo.cc index 965e2c911f2..e43902006d0 100644 --- a/storage/innobase/trx/trx0undo.cc +++ b/storage/innobase/trx/trx0undo.cc @@ -526,7 +526,7 @@ trx_undo_seg_create(fil_space_t* space, trx_rsegf_t* rseg_hdr, ulint* id, } /* Allocate a new file segment for the undo log */ - block = fseg_create(space, 0, TRX_UNDO_SEG_HDR + TRX_UNDO_FSEG_HEADER, + block = fseg_create(space, TRX_UNDO_SEG_HDR + TRX_UNDO_FSEG_HEADER, mtr, true); space->release_free_extents(n_reserved); |