diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:49:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:49:15 +0300 |
| commit | 03174cabd71e0e72746736a3abf24af3931292d8 (patch) | |
| tree | e34ea44f2db2407cfe183bed66390502beb09283 | |
| parent | 35f2cdcb99f4f8b39895070fde3f825329106361 (diff) | |
| download | mariadb-git-03174cabd71e0e72746736a3abf24af3931292d8.tar.gz | |
Fix GCC -Og -Wmaybe-uninitialized
| -rw-r--r-- | storage/spider/spd_sys_table.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/storage/spider/spd_sys_table.cc b/storage/spider/spd_sys_table.cc index a467c2c00fa..20405757873 100644 --- 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 ( - !(db_name = get_field(mem_root, - table->field[SPIDER_LINK_MON_SERVERS_DB_NAME_POS])) || - !(table_name = get_field(mem_root, - table->field[SPIDER_LINK_MON_SERVERS_TABLE_NAME_POS])) || - !(link_id = get_field(mem_root, - table->field[SPIDER_LINK_MON_SERVERS_LINK_ID_POS])) - ) + if (!(db_name= + get_field(mem_root, + table->field[SPIDER_LINK_MON_SERVERS_DB_NAME_POS]))) + DBUG_RETURN(HA_ERR_OUT_OF_MEM); + if (!(table_name= + get_field(mem_root, + 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); |