database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge branch '11.1' into 11.2

Browse Source
This commit is contained in:
Sergei Golubchik
2023-08-17 17:27:05 +02:00
parent 8aa1a9e6a7 9bc25d9820
commit 18ddde4826
879 changed files with 12425 additions and 6297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_parse.cc
View File

@@ -2924,6 +2924,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.
@@ -6118,9 +6128,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 */
}