diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-08 13:43:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-08 13:43:45 +0200 |
| commit | 74b7d0182dc5966898da0f039cf059c3a8ad18f6 (patch) | |
| tree | b2fc7d202225c9aa18551d30d86a4bccd97c1980 | |
| parent | b5ef7ffa59a2f8ef7455cb28c894a505bd6414d5 (diff) | |
| parent | 15b713cadcf61fd6db743709a3435a24eb360745 (diff) | |
| download | mariadb-git-74b7d0182dc5966898da0f039cf059c3a8ad18f6.tar.gz | |
Merge 10.4 into 10.5
| -rw-r--r-- | storage/innobase/fsp/fsp0fsp.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc index ef379f2ffc3..a172807f1dc 100644 --- a/storage/innobase/fsp/fsp0fsp.cc +++ b/storage/innobase/fsp/fsp0fsp.cc @@ -357,16 +357,8 @@ xdes_init( xdes_t* descr, /*!< in: descriptor */ mtr_t* mtr) /*!< in/out: mini-transaction */ { - ulint i; - - ut_ad(descr && mtr); ut_ad(mtr_memo_contains_page(mtr, descr, MTR_MEMO_PAGE_SX_FIX)); - ut_ad((XDES_SIZE - XDES_BITMAP) % 4 == 0); - - for (i = XDES_BITMAP; i < XDES_SIZE; i += 4) { - mlog_write_ulint(descr + i, 0xFFFFFFFFUL, MLOG_4BYTES, mtr); - } - + mlog_memset(descr + XDES_BITMAP, XDES_SIZE - XDES_BITMAP, 0xff, mtr); xdes_set_state(descr, XDES_FREE, mtr); } |