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-6275 spider_same_server_link not enforced (#1330)

Browse Source
This commit is contained in:
Kentoku SHIBA
2019-06-12 19:30:50 +09:00
committed by GitHub
parent 2fd82471ab
commit 8e3a4be45c
9 changed files with 164 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
storage/spider/spd_db_mysql.cc
View File

@@ -56,6 +56,8 @@ extern HASH spider_open_connections;
extern HASH spider_ipport_conns;
extern SPIDER_DBTON spider_dbton[SPIDER_DBTON_SIZE];
extern const char spider_dig_upper[];
extern const char **spd_mysqld_unix_port;
extern uint *spd_mysqld_port;
spider_db_mysql_util spider_db_mysql_utility;
spider_db_mariadb_util spider_db_mariadb_utility;
@@ -1970,6 +1972,30 @@ int spider_db_mbase::connect(
conn->tgt_default_group);
}
if (!spider_param_same_server_link(thd))
{
if (!strcmp(tgt_host, my_localhost))
{
if (!strcmp(tgt_socket, *spd_mysqld_unix_port))
{
my_printf_error(ER_SPIDER_SAME_SERVER_LINK_NUM,
ER_SPIDER_SAME_SERVER_LINK_STR1, MYF(0),
tgt_host, tgt_socket);
DBUG_RETURN(ER_SPIDER_SAME_SERVER_LINK_NUM);
}
} else if (!strcmp(tgt_host, "127.0.0.1") ||
!strcmp(tgt_host, glob_hostname))
{
if (tgt_port == *spd_mysqld_port)
{
my_printf_error(ER_SPIDER_SAME_SERVER_LINK_NUM,
ER_SPIDER_SAME_SERVER_LINK_STR2, MYF(0),
tgt_host, tgt_port);
DBUG_RETURN(ER_SPIDER_SAME_SERVER_LINK_NUM);
}
}
}
if (connect_mutex)
pthread_mutex_lock(&spider_open_conn_mutex);
/* tgt_db not use */