Fix g++-14 -Wmaybe-uninitialized

MariaDB · Mar 19, 2024 · 83a87da · 83a87da
1 parent 2ba4248
commit 83a87da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc
@@ -5420,12 +5420,9 @@ fts_free(
 	dict_table_t*	table)	/*!< in/out: table with FTS indexes */
 {
 	fts_t*	fts = table->fts;
-
-	fts->~fts_t();
-
-	mem_heap_free(fts->fts_heap);
-
 	table->fts = NULL;
+	mem_heap_free(fts->fts_heap);
+	fts->~fts_t();
 }
 
 /*********************************************************************//**

diff --git a/storage/innobase/que/que0que.cc b/storage/innobase/que/que0que.cc
@@ -450,15 +450,12 @@ que_graph_free_recursive(
 		ins = static_cast<ins_node_t*>(node);
 
 		que_graph_free_recursive(ins->select);
-		ins->select = NULL;
-
-		ins->~ins_node_t();
 
 		if (ins->entry_sys_heap != NULL) {
 			mem_heap_free(ins->entry_sys_heap);
-			ins->entry_sys_heap = NULL;
 		}
 
+		ins->~ins_node_t();
 		break;
 	case QUE_NODE_PURGE:
 		purge = static_cast<purge_node_t*>(node);