Skip to content

Commit 337307a

Browse files
mariadb-YuchenPeisanja-byelkin
authored andcommitted
spider_string: use c_ptr_safe() instead of ptr() in error messages
Most other uses of ptr() are accompanied with a length, so we leave them alone.
1 parent ba0d8ae commit 337307a

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

storage/spider/spd_db_mysql.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13310,8 +13310,8 @@ int spider_mbase_handler::show_table_status(
1331013310
my_printf_error(
1331113311
ER_SPIDER_REMOTE_TABLE_NOT_FOUND_NUM,
1331213312
ER_SPIDER_REMOTE_TABLE_NOT_FOUND_STR, MYF(0),
13313-
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].ptr(),
13314-
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].ptr());
13313+
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe(),
13314+
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe());
1331513315
DBUG_RETURN(ER_SPIDER_REMOTE_TABLE_NOT_FOUND_NUM);
1331613316
}
1331713317
} else /* get from information schema */
@@ -13337,15 +13337,15 @@ int spider_mbase_handler::show_table_status(
1333713337
my_printf_error(
1333813338
ER_SPIDER_REMOTE_TABLE_NOT_FOUND_NUM,
1333913339
ER_SPIDER_REMOTE_TABLE_NOT_FOUND_STR, MYF(0),
13340-
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].ptr(),
13341-
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].ptr());
13340+
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe(),
13341+
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe());
1334213342
break;
1334313343
case ER_SPIDER_INVALID_REMOTE_TABLE_INFO_NUM:
1334413344
my_printf_error(
1334513345
ER_SPIDER_INVALID_REMOTE_TABLE_INFO_NUM,
1334613346
ER_SPIDER_INVALID_REMOTE_TABLE_INFO_STR, MYF(0),
13347-
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].ptr(),
13348-
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].ptr());
13347+
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe(),
13348+
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe());
1334913349
break;
1335013350
default:
1335113351
break;
@@ -13361,8 +13361,8 @@ int spider_mbase_handler::show_table_status(
1336113361
my_printf_error(
1336213362
ER_SPIDER_TABLE_OPEN_LOCK_WAIT_TIMEOUT_NUM,
1336313363
ER_SPIDER_TABLE_OPEN_LOCK_WAIT_TIMEOUT_STR, MYF(0),
13364-
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].ptr(),
13365-
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].ptr());
13364+
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe(),
13365+
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe());
1336613366
}
1336713367
DBUG_RETURN(error_num);
1336813368
}
@@ -13480,15 +13480,15 @@ int spider_mbase_handler::show_index(
1348013480
my_printf_error(
1348113481
ER_SPIDER_REMOTE_TABLE_NOT_FOUND_NUM,
1348213482
ER_SPIDER_REMOTE_TABLE_NOT_FOUND_STR, MYF(0),
13483-
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].ptr(),
13484-
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].ptr());
13483+
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe(),
13484+
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe());
1348513485
break;
1348613486
case ER_SPIDER_INVALID_REMOTE_TABLE_INFO_NUM:
1348713487
my_printf_error(
1348813488
ER_SPIDER_INVALID_REMOTE_TABLE_INFO_NUM,
1348913489
ER_SPIDER_INVALID_REMOTE_TABLE_INFO_STR, MYF(0),
13490-
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].ptr(),
13491-
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].ptr());
13490+
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe(),
13491+
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].c_ptr_safe());
1349213492
break;
1349313493
default:
1349413494
break;

0 commit comments

Comments
 (0)