summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-06-21 19:20:11 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2016-06-21 19:20:11 +0200
commit69f1a3215e5062eb6c06ed35ec38e1d824efbef6 (patch)
treea2f65c36cf7cf5254bb63389d1102ab53b0c805f /sql/mysqld.h
parent911af69d1e13e5dff43b550da19d3d4a0ae07e96 (diff)
downloadmariadb-git-69f1a3215e5062eb6c06ed35ec38e1d824efbef6.tar.gz
Replace dynamic loading of mysqld.exe data for plugins, replace with MYSQL_PLUGIN_IMPORT
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index dbc65cd2a43..02e3184404b 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -92,7 +92,7 @@ extern bool opt_disable_networking, opt_skip_show_db;
extern bool opt_skip_name_resolve;
extern bool opt_ignore_builtin_innodb;
extern my_bool opt_character_set_client_handshake;
-extern bool volatile abort_loop;
+extern MYSQL_PLUGIN_IMPORT bool volatile abort_loop;
extern bool in_bootstrap;
extern uint connection_count;
extern my_bool opt_safe_user_create;
@@ -155,7 +155,7 @@ extern char log_error_file[FN_REFLEN], *opt_tc_log_file;
extern const double log_10[309];
extern ulonglong keybuff_size;
extern ulonglong thd_startup_options;
-extern ulong thread_id;
+extern MYSQL_PLUGIN_IMPORT ulong thread_id;
extern ulong binlog_cache_use, binlog_cache_disk_use;
extern ulong binlog_stmt_cache_use, binlog_stmt_cache_disk_use;
extern ulong aborted_threads,aborted_connects;
@@ -226,7 +226,7 @@ extern MYSQL_FILE *bootstrap_file;
extern my_bool old_mode;
extern LEX_STRING opt_init_connect, opt_init_slave;
extern int bootstrap_error;
-extern I_List<THD> threads;
+extern MYSQL_PLUGIN_IMPORT I_List<THD> threads;
extern char err_shared_dir[];
extern ulong connection_errors_select;
extern ulong connection_errors_accept;