revert part of 69f1a32

in particular, revert changes to the spider (avoid diverging from
  the upstream if possible)

3 files changed, 7 insertions, 7 deletions

diff --git a/sql/mysqld.h b/sql/mysqld.h
index 02e3184404b..dbc65cd2a43 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 MYSQL_PLUGIN_IMPORT bool volatile abort_loop;
+extern 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 MYSQL_PLUGIN_IMPORT ulong thread_id;
+extern 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 MYSQL_PLUGIN_IMPORT I_List<THD> threads;
+extern 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 946cc956c41..5cc02c8a10b 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 MYSQL_PLUGIN_IMPORT bool volatile abort_loop;
+extern 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 MYSQL_PLUGIN_IMPORT I_List<THD> threads;
+extern I_List<THD> threads;
 
 #else
 #define close_active_mi() /* no-op */
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 799a6088d3f..46eeeceb112 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_PLUGIN_IMPORT mysql_mutex_t LOCK_xid_cache;
-extern MYSQL_PLUGIN_IMPORT HASH xid_cache;
+extern mysql_mutex_t LOCK_xid_cache;
+extern HASH xid_cache;
 bool xid_cache_init(void);
 void xid_cache_free(void);
 XID_STATE *xid_cache_search(XID *xid);