database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

BUG#59549, Fix compiler errors on Windows, step 5

Browse Source
This commit is contained in:
Mikael Ronstrom
2011-01-24 14:57:07 +01:00
parent c6de041ebc
commit 416b7144d5
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/mysql/thread_pool_priv.h
View File

@ -46,5 +46,10 @@ bool init_new_connection_handler_thread();
max_connections is needed to calculate the maximum number of threads max_connections is needed to calculate the maximum number of threads
that is allowed to be started by the thread pool. that is allowed to be started by the thread pool.
*/ */
extern ulong thread_created, max_connections; extern MYSQL_PLUGIN_IMPORT ulong thread_created;
extern MYSQL_PLUGIN_IMPORT ulong max_connections;
extern MYSQL_PLUGIN_IMPORT mysql_cond_t COND_thread_count;
extern MYSQL_PLUGIN_IMPORT pthread_attr_t connection_attrib;
extern MYSQL_PLUGIN_IMPORT I_List<THD> threads;
extern MYSQL_PLUGIN_IMPORT PSI_thread_key key_thread_one_connection;
#endif #endif

15
sql/mysqld.cc
View File

@ -450,7 +450,7 @@ uint lower_case_table_names;
ulong tc_heuristic_recover= 0; ulong tc_heuristic_recover= 0;
uint volatile thread_count; uint volatile thread_count;
int32 thread_running; int32 thread_running;
ulong thread_created; MYSQL_PLUGIN_IMPORT ulong thread_created;
ulong back_log, connect_timeout, concurrency, server_id; ulong back_log, connect_timeout, concurrency, server_id;
ulong table_cache_size, table_def_size; ulong table_cache_size, table_def_size;
ulong what_to_log; ulong what_to_log;
@ -477,7 +477,8 @@ ulong delayed_insert_errors,flush_time;
ulong specialflag=0; ulong specialflag=0;
ulong binlog_cache_use= 0, binlog_cache_disk_use= 0; ulong binlog_cache_use= 0, binlog_cache_disk_use= 0;
ulong binlog_stmt_cache_use= 0, binlog_stmt_cache_disk_use= 0; ulong binlog_stmt_cache_use= 0, binlog_stmt_cache_disk_use= 0;
ulong max_connections, max_connect_errors; MYSQL_PLUGIN_IMPORT ulong max_connections;
ulong max_connect_errors;
/** /**
Limit of the total number of prepared statements in the server. Limit of the total number of prepared statements in the server.
Is necessary to protect the server against out-of-memory attacks. Is necessary to protect the server against out-of-memory attacks.
@ -580,7 +581,7 @@ Le_creator le_creator;
MYSQL_FILE *bootstrap_file; MYSQL_FILE *bootstrap_file;
int bootstrap_error; int bootstrap_error;
I_List<THD> threads; MYSQL_PLUGIN_IMPORT I_List<THD> threads;
Rpl_filter* rpl_filter; Rpl_filter* rpl_filter;
Rpl_filter* binlog_filter; Rpl_filter* binlog_filter;
@ -629,9 +630,9 @@ mysql_mutex_t LOCK_des_key_file;
#endif #endif
mysql_rwlock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave; mysql_rwlock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave;
mysql_rwlock_t LOCK_system_variables_hash; mysql_rwlock_t LOCK_system_variables_hash;
mysql_cond_t COND_thread_count; MYSQL_PLUGIN_IMPORT mysql_cond_t COND_thread_count;
pthread_t signal_thread; pthread_t signal_thread;
pthread_attr_t connection_attrib; MYSQL_PLUGIN_IMPORT pthread_attr_t connection_attrib;
mysql_mutex_t LOCK_server_started; mysql_mutex_t LOCK_server_started;
mysql_cond_t COND_server_started; mysql_cond_t COND_server_started;
@ -7792,7 +7793,9 @@ static PSI_cond_info all_server_conds[]=
PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert, PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert,
key_thread_handle_manager, key_thread_main, key_thread_handle_manager, key_thread_main,
key_thread_one_connection, key_thread_signal_hand; key_thread_signal_hand;
MYSQL_PLUGIN_IMPORT PSI_thread_key key_thread_one_connection;
static PSI_thread_info all_server_threads[]= static PSI_thread_info all_server_threads[]=
{ {

10
sql/mysqld.h
View File

@ -204,12 +204,12 @@ extern struct my_option my_long_options[];
extern int mysqld_server_started; extern int mysqld_server_started;
extern int orig_argc; extern int orig_argc;
extern char **orig_argv; extern char **orig_argv;
extern pthread_attr_t connection_attrib; extern MYSQL_PLUGIN_IMPORT pthread_attr_t connection_attrib;
extern MYSQL_FILE *bootstrap_file; extern MYSQL_FILE *bootstrap_file;
extern my_bool old_mode; extern my_bool old_mode;
extern LEX_STRING opt_init_connect, opt_init_slave; extern LEX_STRING opt_init_connect, opt_init_slave;
extern int bootstrap_error; extern int bootstrap_error;
extern I_List<THD> threads; extern MYSQL_PLUGIN_IMPORT I_List<THD> threads;
extern char err_shared_dir[]; extern char err_shared_dir[];
extern TYPELIB thread_handling_typelib; extern TYPELIB thread_handling_typelib;
extern my_decimal decimal_zero; extern my_decimal decimal_zero;
@ -263,7 +263,9 @@ extern PSI_cond_key key_BINLOG_COND_prep_xids, key_BINLOG_update_cond,
extern PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert, extern PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert,
key_thread_handle_manager, key_thread_kill_server, key_thread_main, key_thread_handle_manager, key_thread_kill_server, key_thread_main,
key_thread_one_connection, key_thread_signal_hand; key_thread_signal_hand;
extern MYSQL_PLUGIN_IMPORT PSI_thread_key key_thread_one_connection;
#ifdef HAVE_MMAP #ifdef HAVE_MMAP
extern PSI_file_key key_file_map; extern PSI_file_key key_file_map;
@ -335,7 +337,7 @@ extern mysql_mutex_t LOCK_server_started;
extern mysql_cond_t COND_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_grant, LOCK_sys_init_connect, LOCK_sys_init_slave;
extern mysql_rwlock_t LOCK_system_variables_hash; extern mysql_rwlock_t LOCK_system_variables_hash;
extern mysql_cond_t COND_thread_count; extern MYSQL_PLUGIN_IMPORT mysql_cond_t COND_thread_count;
extern mysql_cond_t COND_manager; extern mysql_cond_t COND_manager;
extern int32 thread_running; extern int32 thread_running;
extern my_atomic_rwlock_t thread_running_lock; extern my_atomic_rwlock_t thread_running_lock;