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

8
storage/spider/spd_table.cc
View File

@@ -122,6 +122,8 @@ HASH *spd_db_att_xid_cache;
struct charset_info_st *spd_charset_utf8_bin;
const char **spd_defaults_extra_file;
const char **spd_defaults_file;
const char **spd_mysqld_unix_port;
uint *spd_mysqld_port;
bool volatile *spd_abort_loop;
Time_zone *spd_tz_system;
extern long spider_conn_mutex_id;
@@ -6934,6 +6936,10 @@ int spider_db_init(
GetProcAddress(current_module, "my_defaults_extra_file");
spd_defaults_file = (const char **)
GetProcAddress(current_module, "my_defaults_file");
spd_mysqld_unix_port = (const char **)
GetProcAddress(current_module, "?mysqld_unix_port@@3PADA");
spd_mysqld_port = (uint *)
GetProcAddress(current_module, "?mysqld_port@@3IA");
spd_abort_loop = (bool volatile *)
GetProcAddress(current_module, "?abort_loop@@3_NC");
spd_tz_system = *(Time_zone **)
@@ -6960,6 +6966,8 @@ int spider_db_init(
spd_charset_utf8_bin = &my_charset_utf8_bin;
spd_defaults_extra_file = &my_defaults_extra_file;
spd_defaults_file = &my_defaults_file;
spd_mysqld_unix_port = (const char **) &mysqld_unix_port;
spd_mysqld_port = &mysqld_port;
spd_abort_loop = &abort_loop;
spd_tz_system = my_tz_SYSTEM;
#endif