diff options
| author | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2021-10-19 13:59:14 +0900 |
|---|---|---|
| committer | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2022-09-26 23:23:13 +0900 |
| commit | 2b89598fe017d8ae1898a97071d00581b7ba6271 (patch) | |
| tree | e92ab730612ff8e046942dae1d08b96070e6a097 /storage | |
| parent | fa4e84b5d98fd26cc16719d772590e80a15c7375 (diff) | |
| download | mariadb-git-2b89598fe017d8ae1898a97071d00581b7ba6271.tar.gz | |
MDEV-26852 Spider: -Werror=maybe-uninitialized raises on spd_sys_table.cc and ha_spider.cc
The warning "maybe-uninitialized" raises on spd_sys_table.cc and
ha_spider.cc when the sever is compiled with CMAKE_CXX_FLAGS=-Og.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/spider/ha_spider.cc | 4 | ||||
| -rw-r--r-- | storage/spider/spd_ping_table.cc | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index 6559e28c970..7f283560af5 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -348,7 +348,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"); @@ -425,7 +425,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; partition_handler_share->parallel_search_query_id = 0; pt_handler_share_creator = this; diff --git a/storage/spider/spd_ping_table.cc b/storage/spider/spd_ping_table.cc index 431d46063c3..83fe4593584 100644 --- a/storage/spider/spd_ping_table.cc +++ b/storage/spider/spd_ping_table.cc @@ -950,12 +950,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)); |