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.10 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2023-06-27 17:45:06 +03:00
parent 774dee9abc 135e976696
commit 71a1a28a49
68 changed files with 1775 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_parse.cc
View File

@ -6316,6 +6316,11 @@ static bool __attribute__ ((noinline))
execute_show_status(THD *thd, TABLE_LIST *all_tables)
{
bool res;
#if defined(__GNUC__) && (__GNUC__ >= 13)
#pragma GCC diagnostic ignored "-Wdangling-pointer"
#endif
system_status_var old_status_var= thd->status_var;
thd->initial_status_var= &old_status_var;
WSREP_SYNC_WAIT(thd, WSREP_SYNC_WAIT_BEFORE_SHOW);