Silence bogus -Wmaybe-uninitialized

MariaDB · Mar 21, 2019 · 185a500 · 185a500
1 parent 3d1b6f6
commit 185a500
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc
@@ -4583,6 +4583,7 @@ row_merge_build_indexes(
 		DBUG_RETURN(DB_OUT_OF_MEMORY);
 	}
 
+	crypt_pfx.m_size = 0; /* silence bogus -Wmaybe-uninitialized */
 	TRASH_ALLOC(&crypt_pfx, sizeof crypt_pfx);
 
 	if (log_tmp_is_encrypted()) {

diff --git a/storage/innobase/row/row0purge.cc b/storage/innobase/row/row0purge.cc
@@ -976,11 +976,10 @@ row_purge_parse_undo_rec(
 	node->table = dict_table_open_on_id(
 		table_id, FALSE, DICT_TABLE_OP_NORMAL);
 
-	trx_id_t trx_id;
+	trx_id_t trx_id = TRX_ID_MAX;
 
 	if (node->table == NULL) {
 		/* The table has been dropped: no need to do purge */
-		trx_id = TRX_ID_MAX;
 		goto err_exit;
 	}