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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-01-07 09:08:09 +02:00
parent 8a4ca33938 a993310593
commit 92abdcca5a
178 changed files with 3017 additions and 1446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_parse.cc
View File

@ -5699,6 +5699,14 @@ mysql_execute_command(THD *thd)
break;
}
case SQLCOM_XA_START:
#ifdef WITH_WSREP
if (WSREP(thd))
{
my_error(ER_NOT_SUPPORTED_YET, MYF(0),
"XA transactions with Galera replication");
break;
}
#endif /* WITH_WSREP */
if (trans_xa_start(thd))
goto error;
my_ok(thd);
@ -6745,6 +6753,9 @@ check_access(THD *thd, privilege_t want_access,
bool check_single_table_access(THD *thd, privilege_t privilege,
TABLE_LIST *tables, bool no_errors)
{
if (tables->derived)
return 0;
Switch_to_definer_security_ctx backup_sctx(thd, tables);
const char *db_name;