mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Fixed assert in WSREP if one started with --wsrep_provider=.. --wsrep_on=OFF
Assert was: mariadbd: /my/maria-10.6/wsrep-lib/src/client_state.cpp:256: int wsrep::client_state::after_statement(): Assertion `state() == s_exec' The reason was because of two faults: - A missing test for WSREP(thd) when checking wsrep_after_statement(() - THD->wsrep_cs().state was set to s_idle instead of s_none
This commit is contained in:
@ -3781,7 +3781,8 @@ mysql_execute_command(THD *thd)
|
||||
thd->transaction.stmt.mark_trans_did_ddl();
|
||||
#ifdef WITH_WSREP
|
||||
/* Clean up the previous transaction on implicit commit */
|
||||
if (wsrep_thd_is_local(thd) && wsrep_after_statement(thd))
|
||||
if (WSREP_NNULL(thd) && wsrep_thd_is_local(thd) &&
|
||||
wsrep_after_statement(thd))
|
||||
{
|
||||
goto error;
|
||||
}
|
||||
@ -3855,7 +3856,7 @@ mysql_execute_command(THD *thd)
|
||||
Do not start transaction for stored procedures, it will be handled
|
||||
internally in SP processing.
|
||||
*/
|
||||
if (WSREP(thd) &&
|
||||
if (WSREP_NNULL(thd) &&
|
||||
wsrep_thd_is_local(thd) &&
|
||||
lex->sql_command != SQLCOM_BEGIN &&
|
||||
lex->sql_command != SQLCOM_CALL &&
|
||||
|
Reference in New Issue
Block a user