diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-22 10:23:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-22 10:23:11 +0200 |
| commit | 25f1a7ae69a28ff2b32cd0dfd39437384c9ed400 (patch) | |
| tree | c3e57292b3da0d9c91309cd365b62221a09c8432 /sql/mysqld.h | |
| parent | 1f761c5615c7414d1ccd88ceb70272029ac263cc (diff) | |
| download | mariadb-git-25f1a7ae69a28ff2b32cd0dfd39437384c9ed400.tar.gz | |
revert part of 69f1a32
in particular, revert changes to the spider (avoid diverging from
the upstream if possible)
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 6 |
1 files changed, 3 insertions, 3 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; |