database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 11.2 into 11.3

Browse Source
This commit is contained in:
Marko Mäkelä
2023-10-27 10:48:29 +03:00
parent c4a506f0bf d0f8dfbcf0
commit 7b842f1536
511 changed files with 15169 additions and 29021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_parse.cc
View File

@@ -1934,6 +1934,8 @@ dispatch_command_return dispatch_command(enum enum_server_command command, THD *
MYSQL_QUERY_DONE(thd->is_error());
}
thd->lex->restore_set_statement_var();
#if defined(ENABLED_PROFILING)
thd->profiling.finish_current_query();
thd->profiling.start_new_query("continuing");
@@ -6058,11 +6060,6 @@ 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);