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

Merge 10.6 into 10.7

This commit is contained in:
Marko Mäkelä
2022-04-26 18:59:40 +03:00
274 changed files with 9352 additions and 8456 deletions

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");