diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.h | 6 | ||||
| -rw-r--r-- | sql/slave.h | 4 | ||||
| -rw-r--r-- | sql/sql_class.h | 4 | ||||
| -rw-r--r-- | sql/sql_plugin.h | 2 |
4 files changed, 8 insertions, 8 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; diff --git a/sql/slave.h b/sql/slave.h index 5cc02c8a10b..946cc956c41 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -244,7 +244,7 @@ void slave_output_error_info(rpl_group_info *rgi, THD *thd); pthread_handler_t handle_slave_sql(void *arg); bool net_request_file(NET* net, const char* fname); -extern bool volatile abort_loop; +extern MYSQL_PLUGIN_IMPORT bool volatile abort_loop; extern Master_info *active_mi; /* active_mi for multi-master */ extern Master_info *default_master_info; /* To replace active_mi */ extern Master_info_index *master_info_index; @@ -258,7 +258,7 @@ extern uint report_port; extern char *master_info_file, *report_user; extern char *report_host, *report_password; -extern I_List<THD> threads; +extern MYSQL_PLUGIN_IMPORT I_List<THD> threads; #else #define close_active_mi() /* no-op */ diff --git a/sql/sql_class.h b/sql/sql_class.h index 46eeeceb112..799a6088d3f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1094,8 +1094,8 @@ typedef struct st_xid_state { uint rm_error; } XID_STATE; -extern mysql_mutex_t LOCK_xid_cache; -extern HASH xid_cache; +extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_xid_cache; +extern MYSQL_PLUGIN_IMPORT HASH xid_cache; bool xid_cache_init(void); void xid_cache_free(void); XID_STATE *xid_cache_search(XID *xid); diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h index a0225f4a071..e5f985aa082 100644 --- a/sql/sql_plugin.h +++ b/sql/sql_plugin.h @@ -153,7 +153,7 @@ typedef int (*plugin_type_init)(struct st_plugin_int *); extern I_List<i_string> *opt_plugin_load_list_ptr; extern char *opt_plugin_dir_ptr; -extern char opt_plugin_dir[FN_REFLEN]; +extern MYSQL_PLUGIN_IMPORT char opt_plugin_dir[FN_REFLEN]; extern const LEX_STRING plugin_type_names[]; extern ulong plugin_maturity; extern TYPELIB plugin_maturity_values; |