Commit 5874aac7 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-12353: Fix a Galera assertion failure

trx_rseg_write_wsrep_checkpoint(): Add missing mtr_t::OPT,
and avoid an unnecessary call to mtr_t::memset().

This addresses a debug assertion failure in wsrep_info.plugin.
parent d657cd74
...@@ -72,9 +72,13 @@ trx_rseg_write_wsrep_checkpoint( ...@@ -72,9 +72,13 @@ trx_rseg_write_wsrep_checkpoint(
const ulint xid_length = static_cast<ulint>(xid->gtrid_length const ulint xid_length = static_cast<ulint>(xid->gtrid_length
+ xid->bqual_length); + xid->bqual_length);
mtr->memcpy(*rseg_header, TRX_RSEG + TRX_RSEG_WSREP_XID_DATA mtr->memcpy<mtr_t::OPT>(*rseg_header,
TRX_RSEG + TRX_RSEG_WSREP_XID_DATA
+ rseg_header->frame, xid->data, xid_length); + rseg_header->frame, xid->data, xid_length);
if (UNIV_LIKELY(xid_length < XIDDATASIZE)) { if (xid_length < XIDDATASIZE
&& memcmp(TRX_RSEG + TRX_RSEG_WSREP_XID_DATA
+ rseg_header->frame, field_ref_zero,
XIDDATASIZE - xid_length)) {
mtr->memset(rseg_header, mtr->memset(rseg_header,
TRX_RSEG + TRX_RSEG_WSREP_XID_DATA + xid_length, TRX_RSEG + TRX_RSEG_WSREP_XID_DATA + xid_length,
XIDDATASIZE - xid_length, 0); XIDDATASIZE - xid_length, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment