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

Merge branch 10.4 into 10.5

A few of constaint -> constraint
This commit is contained in:
Daniel Black
2022-04-21 14:48:13 +10:00
20 changed files with 2132 additions and 901 deletions

View File

@ -5906,7 +5906,7 @@ mysql_execute_command(THD *thd)
}
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");