From 9b1b4a6f69f81530b7fe9f1b4a7c517df68652e2 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 30 Aug 2023 15:17:07 +1000 Subject: [PATCH] MDEV-31545 Revert "Fix gcc warning for wsrep_plug" This reverts commit 38fe266ea9537acce888b210cb233f5854d7560e. The correct fix was pushed to the 10.4 branch (fbc157ab33bb2b7a239f13f8b64ce5935f0bdee9) --- sql/sql_parse.cc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index c3d8664639c..abcd690ba8a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -6320,11 +6320,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);