Commit a3531775 authored by Monty's avatar Monty

MDEV-15532 Assertion `!log->same_pk' failed in row_log_table_apply_delete

The real fix for MDEV-15532 will be pushed into 10.2 and 10.6
This is an additional fix for 10.4.

In 10.4 trans_xa_detach was introduced.  However THD::cleanup() assumes
that after trans_xa_detach() is done, there is no registered transactions
anymore. In the 10.2 patch there will be an assert to ensure this, which
will cause 10.4 to fail.

The fix used is to reset the transaction flags in trans_xa_detach().
parent 6261b1f4
...@@ -671,6 +671,8 @@ bool trans_xa_detach(THD *thd) ...@@ -671,6 +671,8 @@ bool trans_xa_detach(THD *thd)
thd->transaction.all.ha_list= 0; thd->transaction.all.ha_list= 0;
thd->transaction.all.no_2pc= 0; thd->transaction.all.no_2pc= 0;
thd->server_status&= ~(SERVER_STATUS_IN_TRANS |
SERVER_STATUS_IN_TRANS_READONLY);
return false; return false;
#endif #endif
} }
......
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