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

Merge 11.4 into 11.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 16:09:56 +03:00
parent ba7088d462 b53b81e937
commit 43465352b9
561 changed files with 5812 additions and 1412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
sql/sql_parse.cc
View File

@ -9227,8 +9227,27 @@ static
void sql_kill(THD *thd, my_thread_id id, killed_state state, killed_type type)
{
#ifdef WITH_WSREP
if (WSREP(thd))
{
if (!(thd->variables.option_bits & OPTION_GTID_BEGIN))
{
WSREP_DEBUG("implicit commit before KILL");
/* Commit the normal transaction if one is active. */
bool commit_failed= trans_commit_implicit(thd);
/* Release metadata locks acquired in this transaction. */
thd->release_transactional_locks();
if (commit_failed || wsrep_after_statement(thd))
{
WSREP_DEBUG("implicit commit failed, MDL released: %lld",
(longlong) thd->thread_id);
return;
}
thd->transaction->stmt.mark_trans_did_ddl();
}
}
bool wsrep_high_priority= false;
#endif
#endif /* WITH_WSREP */
uint error= kill_one_thread(thd, id, state, type
#ifdef WITH_WSREP
, wsrep_high_priority
@ -9260,6 +9279,26 @@ sql_kill_user(THD *thd, LEX_USER *user, killed_state state)
{
uint error;
ha_rows rows;
#ifdef WITH_WSREP
if (WSREP(thd))
{
if (!(thd->variables.option_bits & OPTION_GTID_BEGIN))
{
WSREP_DEBUG("implicit commit before KILL");
/* Commit the normal transaction if one is active. */
bool commit_failed= trans_commit_implicit(thd);
/* Release metadata locks acquired in this transaction. */
thd->release_transactional_locks();
if (commit_failed || wsrep_after_statement(thd))
{
WSREP_DEBUG("implicit commit failed, MDL released: %lld",
(longlong) thd->thread_id);
return;
}
thd->transaction->stmt.mark_trans_did_ddl();
}
}
#endif /* WITH_WSREP */
switch (error= kill_threads_for_user(thd, user, state, &rows))
{
case 0: