database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2024-02-12 11:38:13 +02:00
parent c32e59ac55 36f51d9748
commit 8ec12e0d6d
87 changed files with 1677 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sql/handler.cc
View File

@ -1739,12 +1739,17 @@ int ha_commit_trans(THD *thd, bool all)
// Issue a message to the client and roll back the transaction.
if (trans->no_2pc && rw_ha_count > 1)
{
my_message(ER_ERROR_DURING_COMMIT, "Transactional commit not supported "
"by involved engine(s)", MYF(0));
error= 1;
// REPLACE|INSERT INTO ... SELECT uses TOI for MyISAM|Aria
if (WSREP(thd) && thd->wsrep_cs().mode() != wsrep::client_state::m_toi)
{
my_message(ER_ERROR_DURING_COMMIT, "Transactional commit not supported "
"by involved engine(s)", MYF(0));
error= 1;
}
}
else
error= wsrep_before_commit(thd, all);
if (!error)
error= wsrep_before_commit(thd, all);
}
if (error)
{
@ -2091,8 +2096,12 @@ int ha_rollback_trans(THD *thd, bool all)
}
#ifdef WITH_WSREP
(void) wsrep_before_rollback(thd, all);
// REPLACE|INSERT INTO ... SELECT uses TOI in consistency check
if (thd->wsrep_consistency_check != CONSISTENCY_CHECK_RUNNING)
if (thd->wsrep_cs().mode() != wsrep::client_state::m_toi)
(void) wsrep_before_rollback(thd, all);
#endif /* WITH_WSREP */
if (ha_info)
{
/* Close all cursors that can not survive ROLLBACK */
@ -2129,7 +2138,11 @@ int ha_rollback_trans(THD *thd, bool all)
thd->thread_id, all?"TRUE":"FALSE", wsrep_thd_query(thd),
thd->get_stmt_da()->message(), is_real_trans);
}
(void) wsrep_after_rollback(thd, all);
// REPLACE|INSERT INTO ... SELECT uses TOI in consistency check
if (thd->wsrep_consistency_check != CONSISTENCY_CHECK_RUNNING)
if (thd->wsrep_cs().mode() != wsrep::client_state::m_toi)
(void) wsrep_after_rollback(thd, all);
#endif /* WITH_WSREP */
if (all || !thd->in_active_multi_stmt_transaction())