summaryrefslogtreecommitdiff
path: root/storage/spider
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-06-14 07:53:42 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-06-14 07:53:42 +0300
commite5fab61a734667595a26c2f7984132f4f54f4693 (patch)
tree0badd4ea0898da233ec9bd5e6f7ee63e104db372 /storage/spider
parent2cd45add27be30016693897debb261915dcd064c (diff)
downloadmariadb-git-e5fab61a734667595a26c2f7984132f4f54f4693.tar.gz
MDEV-6275: Use a non-narrowing conversion
On 32-bit systems, sizeof(uint)==sizeof(long). The C++11 narrowing cast would issue a warning due to the sign mismatch.
Diffstat (limited to 'storage/spider')
-rw-r--r--storage/spider/spd_db_mysql.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc
index aa5c27a1f06..58351195a61 100644
--- a/storage/spider/spd_db_mysql.cc
+++ b/storage/spider/spd_db_mysql.cc
@@ -1986,7 +1986,7 @@ int spider_db_mbase::connect(
} else if (!strcmp(tgt_host, "127.0.0.1") ||
!strcmp(tgt_host, glob_hostname))
{
- if (tgt_port == long{*spd_mysqld_port})
+ if (tgt_port == (long) *spd_mysqld_port)
{
my_printf_error(ER_SPIDER_SAME_SERVER_LINK_NUM,
ER_SPIDER_SAME_SERVER_LINK_STR2, MYF(0),