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 10.8 into 10.9

Browse Source
This commit is contained in:
Marko Mäkelä
2022-04-28 15:54:03 +03:00
parent 43fa8e0b8f 133c2129cd
commit 504a3b32f6
306 changed files with 9822 additions and 8734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -5844,7 +5844,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
}
case SQLCOM_XA_START:
#ifdef WITH_WSREP
if (WSREP(thd))
if (WSREP_ON)
{
my_error(ER_NOT_SUPPORTED_YET, MYF(0),
"XA transactions with Galera replication");