Fix GCC -Og -Wmaybe-uninitialized

4b77d38c · Marko Mäkelä · 15a2ff12 · 4b77d38c
Commit 4b77d38c authored Jul 28, 2022 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

storage/spider/spd_sys_table.cc storage/spider/spd_sys_table.cc +5 -5

No files found.
--- a/storage/spider/spd_sys_table.cc
+++ b/storage/spider/spd_sys_table.cc
@@ -2639,11 +2639,11 @@ int spider_get_sys_link_mon_key(
    DBUG_RETURN(ER_SPIDER_SYS_TABLE_VERSION_NUM);
  }
-  if (
+  if (!(db_name = get_field(mem_root, table->field[0])))
-    !(db_name = get_field(mem_root, table->field[0])) ||
+    DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-    !(table_name = get_field(mem_root, table->field[1])) ||
+  if (!(table_name = get_field(mem_root, table->field[1])))
-    !(link_id = get_field(mem_root, table->field[2]))
+    DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-  )
+  if (!(link_id = get_field(mem_root, table->field[2])))
    DBUG_RETURN(HA_ERR_OUT_OF_MEM);
  db_name_length = strlen(db_name);