database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-28301 Spider: Fix GCC warnings, comparing the result of pointer addition ... and NULL

Browse Source 
The condition of the if statements are always true.
This commit is contained in:
Nayuta Yanagisawa
2022-05-13 21:32:49 +09:00
parent 480323f7d6
commit 8c28b27f00
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
storage/spider/spd_db_mysql.cc
View File

@@ -3444,27 +3444,15 @@ int spider_db_mbase::append_lock_tables(
conn_link_idx = tmp_spider->conn_link_idx[tmp_link_idx];
spider_mbase_share *db_share = (spider_mbase_share *)
tmp_spider->share->dbton_share[conn->dbton_id];
if (&db_share->db_names_str[conn_link_idx])
{
db_name = db_share->db_names_str[conn_link_idx].ptr();
db_name_length = db_share->db_names_str[conn_link_idx].length();
db_name_charset = tmp_spider->share->access_charset;
} else {
db_name = tmp_spider->share->tgt_dbs[conn_link_idx];
db_name_length = tmp_spider->share->tgt_dbs_lengths[conn_link_idx];
db_name_charset = system_charset_info;
}
if (&db_share->table_names_str[conn_link_idx])
{
table_name = db_share->table_names_str[conn_link_idx].ptr();
table_name_length = db_share->table_names_str[conn_link_idx].length();
table_name_charset = tmp_spider->share->access_charset;
} else {
table_name = tmp_spider->share->tgt_table_names[conn_link_idx];
table_name_length =
tmp_spider->share->tgt_table_names_lengths[conn_link_idx];
table_name_charset = system_charset_info;
}
db_name = db_share->db_names_str[conn_link_idx].ptr();
db_name_length = db_share->db_names_str[conn_link_idx].length();
db_name_charset = tmp_spider->share->access_charset;
table_name = db_share->table_names_str[conn_link_idx].ptr();
table_name_length = db_share->table_names_str[conn_link_idx].length();
table_name_charset = tmp_spider->share->access_charset;
if ((error_num = spider_db_mbase_utility->
append_lock_table_body(
str,