diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-24 14:38:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-24 14:38:52 +0300 |
| commit | d95361107c07b6e8257a7a82c41b18af64ab8d89 (patch) | |
| tree | 92df0d7f2670e1ec41e62e21741bd121beeceacb /storage/innobase/trx/trx0sys.cc | |
| parent | 37a074f6c35af22f403b3e1d150c17e8ab07f164 (diff) | |
| parent | 88f38661b75e68ed255491ed51e52e73cfe06011 (diff) | |
| download | mariadb-git-d95361107c07b6e8257a7a82c41b18af64ab8d89.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/trx/trx0sys.cc')
| -rw-r--r-- | storage/innobase/trx/trx0sys.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc index fd5617fec76..52e246c5c4f 100644 --- a/storage/innobase/trx/trx0sys.cc +++ b/storage/innobase/trx/trx0sys.cc @@ -191,7 +191,7 @@ trx_sysf_create( /* Create the first rollback segment in the SYSTEM tablespace */ slot_no = trx_sys_rseg_find_free(block); buf_block_t* rblock = trx_rseg_header_create(fil_system.sys_space, - slot_no, block, mtr); + slot_no, 0, block, mtr); ut_a(slot_no == TRX_SYS_SYSTEM_RSEG_ID); ut_a(rblock->page.id() == page_id_t(0, FSP_FIRST_RSEG_PAGE_NO)); @@ -293,7 +293,7 @@ static trx_rseg_t *trx_rseg_create(ulint space_id) { ulint rseg_id= trx_sys_rseg_find_free(sys_header); if (buf_block_t *rblock= rseg_id == ULINT_UNDEFINED - ? nullptr : trx_rseg_header_create(space, rseg_id, sys_header, + ? nullptr : trx_rseg_header_create(space, rseg_id, 0, sys_header, &mtr)) { ut_ad(trx_sysf_rseg_get_space(sys_header, rseg_id) == space_id); |