mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed variables no longer needed in plugins, moved to methods instead

Browse source
This commit is contained in:
Mikael Ronstrom 2011-05-13 15:46:35 +02:00
parent e44579d24d
commit e2602f4eab
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sql/mysqld.cc
View file

@ -447,7 +447,7 @@ uint lower_case_table_names;
ulong tc_heuristic_recover= 0;
uint volatile thread_count;
int32 thread_running;
MYSQL_PLUGIN_IMPORT ulong thread_created;
ulong thread_created;
ulong back_log, connect_timeout, concurrency, server_id;
ulong table_cache_size, table_def_size;
ulong what_to_log;
@ -474,8 +474,7 @@ ulong delayed_insert_errors,flush_time;
ulong specialflag=0;
ulong binlog_cache_use= 0, binlog_cache_disk_use= 0;
ulong binlog_stmt_cache_use= 0, binlog_stmt_cache_disk_use= 0;
MYSQL_PLUGIN_IMPORT ulong max_connections;
ulong max_connect_errors;
ulong max_connections, max_connect_errors;
/*
Maximum length of parameter value which can be set through
mysql_send_long_data() call.
@ -583,7 +582,7 @@ Le_creator le_creator;
MYSQL_FILE *bootstrap_file;
int bootstrap_error;
MYSQL_PLUGIN_IMPORT I_List<THD> threads;
I_List<THD> threads;
Rpl_filter* rpl_filter;
Rpl_filter* binlog_filter;
@ -632,9 +631,9 @@ mysql_mutex_t LOCK_des_key_file;
#endif
mysql_rwlock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave;
mysql_rwlock_t LOCK_system_variables_hash;
MYSQL_PLUGIN_IMPORT mysql_cond_t COND_thread_count;
mysql_cond_t COND_thread_count;
pthread_t signal_thread;
MYSQL_PLUGIN_IMPORT pthread_attr_t connection_attrib;
pthread_attr_t connection_attrib;
mysql_mutex_t LOCK_server_started;
mysql_cond_t COND_server_started;
@ -7871,9 +7870,7 @@ static PSI_cond_info all_server_conds[]=
PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert,
key_thread_handle_manager, key_thread_main,
key_thread_signal_hand;
MYSQL_PLUGIN_IMPORT PSI_thread_key key_thread_one_connection;
key_thread_one_connection, key_thread_signal_hand;
static PSI_thread_info all_server_threads[]=
{

10
sql/mysqld.h
View file

@ -206,12 +206,12 @@ extern struct my_option my_long_options[];
extern int mysqld_server_started;
extern "C" MYSQL_PLUGIN_IMPORT int orig_argc;
extern "C" MYSQL_PLUGIN_IMPORT char **orig_argv;
extern MYSQL_PLUGIN_IMPORT pthread_attr_t connection_attrib;
extern pthread_attr_t connection_attrib;
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 TYPELIB thread_handling_typelib;
extern my_decimal decimal_zero;
@ -267,9 +267,7 @@ extern PSI_cond_key key_RELAYLOG_update_cond;
extern PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert,
key_thread_handle_manager, key_thread_kill_server, key_thread_main,
key_thread_signal_hand;
extern MYSQL_PLUGIN_IMPORT PSI_thread_key key_thread_one_connection;
key_thread_one_connection, key_thread_signal_hand;
#ifdef HAVE_MMAP
extern PSI_file_key key_file_map;
@ -342,7 +340,7 @@ extern mysql_mutex_t LOCK_server_started;
extern mysql_cond_t COND_server_started;
extern mysql_rwlock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave;
extern mysql_rwlock_t LOCK_system_variables_hash;
extern MYSQL_PLUGIN_IMPORT mysql_cond_t COND_thread_count;
extern mysql_cond_t COND_thread_count;
extern mysql_cond_t COND_manager;
extern int32 thread_running;
extern my_atomic_rwlock_t thread_running_lock;