mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
MDEV-15772 Potential list overrun during XA recovery
InnoDB could return the same list again and again if the buffer passed to trx_recover_for_mysql() is smaller than the number of transactions that InnoDB recovered in XA PREPARE state. We introduce the transaction state TRX_PREPARED_RECOVERED, which is like TRX_PREPARED, but will be set during trx_recover_for_mysql() so that each transaction will only be returned once. Because init_server_components() is invoking ha_recover() twice, we must reset the state of the transactions back to TRX_PREPARED after returning the complete list, so that repeated traversals will see the complete list again, instead of seeing an empty list. Without this tweak, the test main.tc_heuristic_recover would hang in MariaDB 10.1.
This commit is contained in:
committed by
Marko Mäkelä
parent
cb8d888c42
commit
d5da8ae04d
@ -1740,6 +1740,7 @@ int ha_recover(HASH *commit_list)
|
||||
for (info.len= MAX_XID_LIST_SIZE ;
|
||||
info.list==0 && info.len > MIN_XID_LIST_SIZE; info.len/=2)
|
||||
{
|
||||
DBUG_EXECUTE_IF("min_xa_len", info.len = 16;);
|
||||
info.list=(XID *)my_malloc(info.len*sizeof(XID), MYF(0));
|
||||
}
|
||||
if (!info.list)
|
||||
|
Reference in New Issue
Block a user