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 branch '10.11' into 11.0

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-08 21:03:46 +02:00
parent f2b4972bd4 036df5f970
commit 51f9d62005
870 changed files with 11721 additions and 6311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_parse.cc
View File

@ -2925,6 +2925,16 @@ retry:
if (result)
goto err;
}
#ifdef WITH_WSREP
if (WSREP(thd) && table->table->s->table_type == TABLE_TYPE_SEQUENCE)
{
my_error(ER_NOT_SUPPORTED_YET, MYF(0),
"LOCK TABLE on SEQUENCES in Galera cluster");
goto err;
}
#endif
}
/*
Check privileges of view tables here, after views were opened.
@ -6342,9 +6352,11 @@ execute_show_status(THD *thd, TABLE_LIST *all_tables)
memcpy(&thd->status_var, &old_status_var,
offsetof(STATUS_VAR, last_cleared_system_status_var));
mysql_mutex_unlock(&LOCK_status);
thd->initial_status_var= NULL;
return res;
#ifdef WITH_WSREP
wsrep_error_label: /* see WSREP_SYNC_WAIT() macro above */
thd->initial_status_var= NULL;
return true;
#endif /* WITH_WSREP */
}