Fix GCC -Og -Wmaybe-uninitialized

03174cab · Marko Mäkelä · 35f2cdcb · 03174cab
Commit 03174cab authored Jun 27, 2022 by Marko Mäkelä
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 8 deletions

storage/spider/spd_sys_table.cc storage/spider/spd_sys_table.cc +11 -8

No files found.
--- a/storage/spider/spd_sys_table.cc
+++ b/storage/spider/spd_sys_table.cc
@@ -2982,14 +2982,17 @@ int spider_get_sys_link_mon_key(
    DBUG_RETURN(ER_SPIDER_SYS_TABLE_VERSION_NUM);
  }
-  if (
+  if (!(db_name=
-    !(db_name = get_field(mem_root,
+        get_field(mem_root,
-      table->field[SPIDER_LINK_MON_SERVERS_DB_NAME_POS])) ||
+                  table->field[SPIDER_LINK_MON_SERVERS_DB_NAME_POS])))
-    !(table_name = get_field(mem_root,
+    DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-      table->field[SPIDER_LINK_MON_SERVERS_TABLE_NAME_POS])) ||
+  if (!(table_name=
-    !(link_id = get_field(mem_root,
+        get_field(mem_root,
-      table->field[SPIDER_LINK_MON_SERVERS_LINK_ID_POS]))
+                  table->field[SPIDER_LINK_MON_SERVERS_TABLE_NAME_POS])))
-  )
+    DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+  if (!(link_id=
+        get_field(mem_root,
+                  table->field[SPIDER_LINK_MON_SERVERS_LINK_ID_POS])))
    DBUG_RETURN(HA_ERR_OUT_OF_MEM);
  db_name_length = strlen(db_name);