diff options
| author | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2021-10-19 13:59:14 +0900 |
|---|---|---|
| committer | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2021-10-19 14:04:42 +0900 |
| commit | 0aee34bb3cf2de502304b7694a5b2b785fe30338 (patch) | |
| tree | a23379d5b517697c59f17f20d07c783f4fbdf620 | |
| parent | 27bf57fd6dcfbaf6a116570e861b272eeae0b43c (diff) | |
| download | mariadb-git-bb-10.2-mdev-26852.tar.gz | |
MDEV-26852 Spider: -Werror=maybe-uninitialized raises on spd_sys_table.cc and ha_spider.ccbb-10.2-mdev-26852
The warning "maybe-uninitialized" raises on spd_sys_table.cc and
ha_spider.cc when the sever is compiled with CMAKE_CXX_FLAGS=-Og.
| -rw-r--r-- | storage/spider/ha_spider.cc | 4 | ||||
| -rw-r--r-- | storage/spider/spd_ping_table.cc | 11 | ||||
| -rw-r--r-- | storage/spider/spd_sys_table.cc | 10 |
3 files changed, 14 insertions, 11 deletions
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index 6dbc34706da..152994c9f86 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -335,7 +335,7 @@ int ha_spider::open( may_be_clone = FALSE; ha_spider **pt_handler_share_handlers; #ifdef SPIDER_HAS_HASH_VALUE_TYPE - my_hash_value_type hash_value; + my_hash_value_type hash_value = 0; #endif #endif DBUG_ENTER("ha_spider::open"); @@ -412,7 +412,9 @@ int ha_spider::open( partition_handler_share->between_flg = FALSE; partition_handler_share->idx_bitmap_is_set = FALSE; partition_handler_share->rnd_bitmap_is_set = FALSE; +#ifdef SPIDER_HAS_HASH_VALUE_TYPE partition_handler_share->table_hash_value = hash_value; +#endif partition_handler_share->creator = this; pt_handler_share_creator = this; if (part_num) diff --git a/storage/spider/spd_ping_table.cc b/storage/spider/spd_ping_table.cc index 89c097bddcc..83eeff2b9ed 100644 --- a/storage/spider/spd_ping_table.cc +++ b/storage/spider/spd_ping_table.cc @@ -740,12 +740,13 @@ int spider_ping_table_cache_compare( char *db_name, *table_name, *link_id; DBUG_ENTER("spider_ping_table_cache_compare"); - if ( - !(db_name = get_field(mem_root, table->field[0])) || - !(table_name = get_field(mem_root, table->field[1])) || - !(link_id = get_field(mem_root, table->field[2])) - ) + if (!(db_name = get_field(mem_root, table->field[0]))) + DBUG_RETURN(HA_ERR_OUT_OF_MEM); + if (!(table_name = get_field(mem_root, table->field[1]))) DBUG_RETURN(HA_ERR_OUT_OF_MEM); + if (!(link_id = get_field(mem_root, table->field[2]))) + DBUG_RETURN(HA_ERR_OUT_OF_MEM); + DBUG_PRINT("info", ("spider db_name=%s", db_name)); DBUG_PRINT("info", ("spider table_name=%s", table_name)); DBUG_PRINT("info", ("spider link_id=%s", link_id)); diff --git a/storage/spider/spd_sys_table.cc b/storage/spider/spd_sys_table.cc index 8924629b48d..c8279f02f05 100644 --- a/storage/spider/spd_sys_table.cc +++ b/storage/spider/spd_sys_table.cc @@ -2061,11 +2061,11 @@ int spider_get_sys_link_mon_key( DBUG_RETURN(ER_SPIDER_SYS_TABLE_VERSION_NUM); } - if ( - !(db_name = get_field(mem_root, table->field[0])) || - !(table_name = get_field(mem_root, table->field[1])) || - !(link_id = get_field(mem_root, table->field[2])) - ) + if (!(db_name = get_field(mem_root, table->field[0]))) + DBUG_RETURN(HA_ERR_OUT_OF_MEM); + if (!(table_name = get_field(mem_root, table->field[1]))) + 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); |