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 commit '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-01-06 10:53:00 +01:00
parent 5f10870c8a 478b83032b
commit 02e7bff882
160 changed files with 2757 additions and 1356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_parse.cc
View File

@ -5847,6 +5847,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);
@ -6893,6 +6901,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;