diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
| commit | f00a314f9a659399eff392c4b635d1c381b9badb (patch) | |
| tree | c64e89699dcc22b4ba3a62f83f21252c486617ce /sql/mysqld.h | |
| parent | e191833d758e89d282aea2d84126c9ca10036571 (diff) | |
| parent | 2f3d4bd566b5e377fe8a1749c14050b0a0e083d0 (diff) | |
| download | mariadb-git-f00a314f9a659399eff392c4b635d1c381b9badb.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
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 7e0a95ddab4..8b88c2d4ee9 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -85,7 +85,6 @@ void kill_mysql(THD *thd= 0); void close_connection(THD *thd, uint sql_errno= 0); void handle_connection_in_main_thread(CONNECT *thd); void create_thread_to_handle_connection(CONNECT *connect); -void delete_running_thd(THD *thd); void signal_thd_deleted(); void unlink_thd(THD *thd); bool one_thread_per_connection_end(THD *thd, bool put_in_cache); @@ -146,7 +145,8 @@ extern my_bool sp_automatic_privileges, opt_noacl; extern ulong use_stat_tables; extern my_bool opt_old_style_user_limits, trust_function_creators; extern uint opt_crash_binlog_innodb; -extern char *shared_memory_base_name, *mysqld_unix_port; +extern const char *shared_memory_base_name; +extern char *mysqld_unix_port; extern my_bool opt_enable_shared_memory; extern ulong opt_replicate_events_marked_for_skip; extern char *default_tz_name; @@ -295,7 +295,7 @@ extern PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_xid_list, key_LOCK_thd_data, key_LOCK_user_conn, key_LOG_LOCK_log, key_master_info_data_lock, key_master_info_run_lock, - key_master_info_sleep_lock, + key_master_info_sleep_lock, key_master_info_start_stop_lock, key_mutex_slave_reporting_capability_err_lock, key_relay_log_info_data_lock, key_relay_log_info_log_space_lock, key_relay_log_info_run_lock, key_rpl_group_info_sleep_lock, |