Commit 789a2a36 authored by Marko Mäkelä's avatar Marko Mäkelä

fixup 0a67b15a

trx_t::free(): Declare xid as fully initialized in order to
avoid tripping the subsequent MEM_CHECK_DEFINED
(in WITH_MSAN and WITH_VALGRIND builds).
parent b797f217
...@@ -362,6 +362,13 @@ trx_t *trx_create() ...@@ -362,6 +362,13 @@ trx_t *trx_create()
/** Free the memory to trx_pools */ /** Free the memory to trx_pools */
void trx_t::free() void trx_t::free()
{ {
#ifdef HAVE_MEM_CHECK
if (xid.is_null())
MEM_MAKE_DEFINED(&xid, sizeof xid);
else
MEM_MAKE_DEFINED(&xid.data[xid.gtrid_length + xid.bqual_length],
sizeof xid.data - (xid.gtrid_length + xid.bqual_length));
#endif
MEM_CHECK_DEFINED(this, sizeof *this); MEM_CHECK_DEFINED(this, sizeof *this);
ut_ad(!n_mysql_tables_in_use); ut_ad(!n_mysql_tables_in_use);
......
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