diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-03 10:29:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-03 11:05:19 +0200 |
| commit | af5947f433e98d0447960da07856eb207dd09e01 (patch) | |
| tree | fbb21b374bf87d1462e5f7c22f0a35d795d31f95 /storage/innobase/trx/trx0undo.cc | |
| parent | 87839258f86196dfca1d3af2a947e570e13eeb94 (diff) | |
| download | mariadb-git-af5947f433e98d0447960da07856eb207dd09e01.tar.gz | |
MDEV-21174: Replace mlog_write_string() with mtr_t::memcpy()
mtr_t::memcpy(): Replaces mlog_write_string(), mlog_log_string().
The buf_block_t is passed a parameter, so that
mlog_write_initial_log_record_low() can be used instead of
mlog_write_initial_log_record_fast().
fil_space_crypt_t::write_page0(): Remove the fil_space_t* parameter.
Diffstat (limited to 'storage/innobase/trx/trx0undo.cc')
| -rw-r--r-- | storage/innobase/trx/trx0undo.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/trx/trx0undo.cc b/storage/innobase/trx/trx0undo.cc index d6fc0da35d1..bcd21d7f250 100644 --- a/storage/innobase/trx/trx0undo.cc +++ b/storage/innobase/trx/trx0undo.cc @@ -597,9 +597,7 @@ static void trx_undo_write_xid(buf_block_t *block, uint16_t offset, static_cast<uint32_t>(xid.bqual_length)); const ulint xid_length= static_cast<ulint>(xid.gtrid_length + xid.bqual_length); - mlog_write_string(log_hdr + TRX_UNDO_XA_XID, - reinterpret_cast<const byte*>(xid.data), - xid_length, mtr); + mtr->memcpy(block, offset + TRX_UNDO_XA_XID, xid.data, xid_length); if (UNIV_LIKELY(xid_length < XIDDATASIZE)) mtr->memset(block, offset + TRX_UNDO_XA_XID + xid_length, XIDDATASIZE - xid_length, 0); |