Skip to content

Commit 8c28b27

Browse files
MDEV-28301 Spider: Fix GCC warnings, comparing the result of pointer addition ... and NULL
The condition of the if statements are always true.
1 parent 480323f commit 8c28b27

File tree

1 file changed

+9
-21
lines changed

1 file changed

+9
-21
lines changed

storage/spider/spd_db_mysql.cc

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3444,27 +3444,15 @@ int spider_db_mbase::append_lock_tables(
34443444
conn_link_idx = tmp_spider->conn_link_idx[tmp_link_idx];
34453445
spider_mbase_share *db_share = (spider_mbase_share *)
34463446
tmp_spider->share->dbton_share[conn->dbton_id];
3447-
if (&db_share->db_names_str[conn_link_idx])
3448-
{
3449-
db_name = db_share->db_names_str[conn_link_idx].ptr();
3450-
db_name_length = db_share->db_names_str[conn_link_idx].length();
3451-
db_name_charset = tmp_spider->share->access_charset;
3452-
} else {
3453-
db_name = tmp_spider->share->tgt_dbs[conn_link_idx];
3454-
db_name_length = tmp_spider->share->tgt_dbs_lengths[conn_link_idx];
3455-
db_name_charset = system_charset_info;
3456-
}
3457-
if (&db_share->table_names_str[conn_link_idx])
3458-
{
3459-
table_name = db_share->table_names_str[conn_link_idx].ptr();
3460-
table_name_length = db_share->table_names_str[conn_link_idx].length();
3461-
table_name_charset = tmp_spider->share->access_charset;
3462-
} else {
3463-
table_name = tmp_spider->share->tgt_table_names[conn_link_idx];
3464-
table_name_length =
3465-
tmp_spider->share->tgt_table_names_lengths[conn_link_idx];
3466-
table_name_charset = system_charset_info;
3467-
}
3447+
3448+
db_name = db_share->db_names_str[conn_link_idx].ptr();
3449+
db_name_length = db_share->db_names_str[conn_link_idx].length();
3450+
db_name_charset = tmp_spider->share->access_charset;
3451+
3452+
table_name = db_share->table_names_str[conn_link_idx].ptr();
3453+
table_name_length = db_share->table_names_str[conn_link_idx].length();
3454+
table_name_charset = tmp_spider->share->access_charset;
3455+
34683456
if ((error_num = spider_db_mbase_utility->
34693457
append_lock_table_body(
34703458
str,

0 commit comments

Comments
 (0)