mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.6 into 10.8

Browse source
This commit is contained in:
Marko Mäkelä 2023-04-12 15:50:08 +03:00
commit 1d1e0ab2cc
381 changed files with 13047 additions and 7427 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sql/wsrep_trans_observer.h
View file

@ -1,4 +1,4 @@
/* Copyright 2016-2022 Codership Oy <http://www.codership.com>
/* Copyright 2016-2023 Codership Oy <http://www.codership.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -217,6 +217,19 @@ static inline bool wsrep_run_commit_hook(THD* thd, bool all)
}
mysql_mutex_unlock(&thd->LOCK_thd_data);
}
mysql_mutex_lock(&thd->LOCK_thd_data);
/* Transaction creating sequence is TOI or RSU,
CREATE [TEMPORARY] SEQUENCE = CREATE + INSERT (initial value)
and replicated using statement based replication, thus
the commit hooks will be skipped */
if (ret &&
(thd->wsrep_cs().mode() == wsrep::client_state::m_toi ||
thd->wsrep_cs().mode() == wsrep::client_state::m_rsu) &&
thd->lex->sql_command == SQLCOM_CREATE_SEQUENCE)
ret= false;
mysql_mutex_unlock(&thd->LOCK_thd_data);
DBUG_PRINT("wsrep", ("return: %d", ret));
DBUG_RETURN(ret);
}