diff --git a/mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result b/mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result deleted file mode 100644 index a01fffac004..00000000000 --- a/mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result +++ /dev/null @@ -1,11 +0,0 @@ -SET @global_start_value = @@global.slave_allow_batching; -ERROR HY000: Unknown system variable 'slave_allow_batching' -'#--------------------FN_DYNVARS_145_01------------------------#' -'#---------------------FN_DYNVARS_145_02-------------------------#' -'#--------------------FN_DYNVARS_145_03------------------------#' -'#--------------------FN_DYNVARS_145_04-------------------------#' -'#-------------------FN_DYNVARS_145_05----------------------------#' -'#----------------------FN_DYNVARS_145_06------------------------#' -'#----------------------FN_DYNVARS_145_07------------------------#' -'#---------------------FN_DYNVARS_145_08-------------------------#' -'#---------------------FN_DYNVARS_145_09----------------------#' diff --git a/mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test b/mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test deleted file mode 100644 index e8b52259051..00000000000 --- a/mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test +++ /dev/null @@ -1,165 +0,0 @@ -############## mysql-test\t\slave_allow_batching_basic.test #################### -# # -# Variable Name: slave_allow_batching # -# Scope: GLOBAL & SESSION # -# Access Type: Dynamic # -# Data Type: Numeric # -# Default Value: 1 # -# Range: 1 - 65536 # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Rizwan Maredia # -# # -# Description: Test Cases of Dynamic System Variable slave_allow_batching # -# that checks the behavior of this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -################################################################################ - ---source include/load_sysvars.inc - -######################################################################## -# START OF slave_allow_batching TESTS # -######################################################################## - - -################################################################################ -# Saving initial value of slave_allow_batching in a temporary variable # -################################################################################ - ---Error ER_UNKNOWN_SYSTEM_VARIABLE -SET @global_start_value = @@global.slave_allow_batching; - ---echo '#--------------------FN_DYNVARS_145_01------------------------#' -######################################################################## -# Display the DEFAULT value of slave_allow_batching # -######################################################################## - -#SET @@global.slave_allow_batching = 1; -#SET @@global.slave_allow_batching = DEFAULT; -#SELECT @@global.slave_allow_batching; - ---echo '#---------------------FN_DYNVARS_145_02-------------------------#' -############################################################################# -# Check if slave_allow_batching can be accessed with and without @@ sign # -############################################################################# - -#--Error ER_GLOBAL_VARIABLE -#SET slave_allow_batching = 1; -#SELECT @@slave_allow_batching; -#--Error ER_UNKNOWN_TABLE -#SELECT global.slave_allow_batching; -# -#SET global slave_allow_batching = 1; -#SELECT @@global.slave_allow_batching; - - ---echo '#--------------------FN_DYNVARS_145_03------------------------#' -######################################################################## -# Change the value of slave_allow_batching to a valid value # -######################################################################## - -#SET @@global.slave_allow_batching = 0; -#SELECT @@global.slave_allow_batching; -#SET @@global.slave_allow_batching = 1; -#SELECT @@global.slave_allow_batching; - - ---echo '#--------------------FN_DYNVARS_145_04-------------------------#' -########################################################################### -# Change the value of slave_allow_batching to invalid value # -########################################################################### - -#--Error ER_WRONG_VALUE_FOR_VAR -#SET @@global.slave_allow_batching = -1; -#--Error ER_WRONG_VALUE_FOR_VAR -#SET @@global.slave_allow_batching = 2; -#--Error ER_WRONG_VALUE_FOR_VAR -#SET @@global.slave_allow_batching = "T"; -#--Error ER_WRONG_VALUE_FOR_VAR -#SET @@global.slave_allow_batching = "Y"; -#--Error ER_WRONG_VALUE_FOR_VAR -#SET @@global.slave_allow_batching = YES; -#--Error ER_WRONG_VALUE_FOR_VAR -#SET @@global.slave_allow_batching = ONN; -#--Error ER_WRONG_VALUE_FOR_VAR -#SET @@global.slave_allow_batching = OOF; -#--Error ER_WRONG_VALUE_FOR_VAR -#SET @@global.slave_allow_batching = 0FF; -#--Error ER_WRONG_VALUE_FOR_VAR -#SET @@global.slave_allow_batching = ' 1'; -#--Error ER_WRONG_VALUE_FOR_VAR -#SET @@global.slave_allow_batching = NO; - - ---echo '#-------------------FN_DYNVARS_145_05----------------------------#' -########################################################################### -# Test if accessing session slave_allow_batching gives error # -########################################################################### - -#--Error ER_GLOBAL_VARIABLE -#SET @@session.slave_allow_batching = 0; -#--Error ER_GLOBAL_VARIABLE -#SET @@slave_allow_batching = 0; -#--Error ER_GLOBAL_VARIABLE -#SET @@local.slave_allow_batching = 0; -#--Error ER_INCORRECT_GLOBAL_LOCAL_VAR -#SELECT @@session.slave_allow_batching; -#--Error ER_INCORRECT_GLOBAL_LOCAL_VAR -#SELECT @@local.slave_allow_batching; - ---echo '#----------------------FN_DYNVARS_145_06------------------------#' -######################################################################### -# Check if the value in SESSION Table contains variable value # -######################################################################### - -#SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='slave_allow_batching'; - - ---echo '#----------------------FN_DYNVARS_145_07------------------------#' -######################################################################### -# Check if the value in GLOBAL Table matches value in variable # -######################################################################### - -#SELECT IF(@@global.slave_allow_batching, "ON", "OFF") = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='slave_allow_batching'; -#SELECT @@global.slave_allow_batching; -#SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='slave_allow_batching'; -#--echo 'Bug: value in information schema does not match' - ---echo '#---------------------FN_DYNVARS_145_08-------------------------#' -################################################################### -# Check if ON and OFF values can be used on variable # -################################################################### - -#SET @@global.slave_allow_batching = OFF; -#SELECT @@global.slave_allow_batching; -#SET @@global.slave_allow_batching = ON; -#SELECT @@global.slave_allow_batching; - ---echo '#---------------------FN_DYNVARS_145_09----------------------#' -################################################################### -# Check if TRUE and FALSE values can be used on variable # -################################################################### - -#SET @@global.slave_allow_batching = TRUE; -#SELECT @@global.slave_allow_batching; -#SET @@global.slave_allow_batching = FALSE; -#SELECT @@global.slave_allow_batching; - -############################## -# Restore initial value # -############################## - -#SET @@global.slave_allow_batching = @global_start_value; -#SELECT @@global.slave_allow_batching; - -############################################################### -# END OF slave_allow_batching TESTS # -############################################################### diff --git a/sql/log_event.cc b/sql/log_event.cc index 3802f76efe0..3974435601c 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -64,7 +64,6 @@ PSI_memory_key key_memory_log_event; #endif PSI_memory_key key_memory_Incident_log_event_message; -PSI_memory_key key_memory_Rows_query_log_event_rows_query; /** BINLOG_CHECKSUM variable. diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6c7e6109473..847134bec44 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -453,7 +453,7 @@ my_bool opt_master_verify_checksum= 0; my_bool opt_slave_sql_verify_checksum= 1; const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NullS}; volatile sig_atomic_t calling_initgroups= 0; /**< Used in SIGSEGV handler. */ -uint mysqld_port, select_errors, dropping_tables, ha_open_options; +uint mysqld_port, select_errors, ha_open_options; uint mysqld_extra_port; uint mysqld_port_timeout; ulong delay_key_write_options; @@ -7902,7 +7902,7 @@ static int mysql_init_variables(void) disable_log_notes= 0; mqh_used= 0; cleanup_done= 0; - select_errors= dropping_tables= ha_open_options=0; + select_errors= ha_open_options= 0; THD_count::count= CONNECT::count= 0; slave_open_temp_tables= 0; opt_endinfo= using_udf_functions= 0; @@ -9787,33 +9787,22 @@ static PSI_memory_info all_server_memory[]= { &key_memory_locked_table_list, "Locked_tables_list::m_locked_tables_root", 0}, { &key_memory_locked_thread_list, "display_table_locks", PSI_FLAG_THREAD}, { &key_memory_thd_transactions, "THD::transactions::mem_root", PSI_FLAG_THREAD}, -// { &key_memory_delegate, "Delegate::memroot", 0}, { &key_memory_acl_mem, "sql_acl_mem", PSI_FLAG_GLOBAL}, { &key_memory_acl_memex, "sql_acl_memex", PSI_FLAG_GLOBAL}, { &key_memory_acl_cache, "acl_cache", PSI_FLAG_GLOBAL}, { &key_memory_thd_main_mem_root, "thd::main_mem_root", PSI_FLAG_THREAD}, -// { &key_memory_help, "help", 0}, -// { &key_memory_new_frm_mem, "new_frm_mem", 0}, { &key_memory_table_share, "TABLE_SHARE::mem_root", PSI_FLAG_GLOBAL}, /* table definition cache */ { &key_memory_gdl, "gdl", 0}, { &key_memory_table_triggers_list, "Table_triggers_list", 0}, // { &key_memory_servers, "servers", 0}, { &key_memory_prepared_statement_map, "Prepared_statement_map", PSI_FLAG_THREAD}, { &key_memory_prepared_statement_main_mem_root, "Prepared_statement::main_mem_root", PSI_FLAG_THREAD}, -// { &key_memory_protocol_rset_root, "Protocol_local::m_rset_root", PSI_FLAG_THREAD}, -// { &key_memory_warning_info_warn_root, "Warning_info::m_warn_root", PSI_FLAG_THREAD}, { &key_memory_sp_cache, "THD::sp_cache", 0}, { &key_memory_sp_head_main_root, "sp_head::main_mem_root", 0}, { &key_memory_sp_head_execute_root, "sp_head::execute_mem_root", PSI_FLAG_THREAD}, { &key_memory_sp_head_call_root, "sp_head::call_mem_root", PSI_FLAG_THREAD}, { &key_memory_table_mapping_root, "table_mapping::m_mem_root", 0}, { &key_memory_quick_range_select_root, "QUICK_RANGE_SELECT::alloc", PSI_FLAG_THREAD}, -// { &key_memory_quick_index_merge_root, "QUICK_INDEX_MERGE_SELECT::alloc", PSI_FLAG_THREAD}, -// { &key_memory_quick_ror_intersect_select_root, "QUICK_ROR_INTERSECT_SELECT::alloc", PSI_FLAG_THREAD}, -// { &key_memory_quick_ror_union_select_root, "QUICK_ROR_UNION_SELECT::alloc", PSI_FLAG_THREAD}, -// { &key_memory_quick_group_min_max_select_root, "QUICK_GROUP_MIN_MAX_SELECT::alloc", PSI_FLAG_THREAD}, -// { &key_memory_test_quick_select_exec, "test_quick_select", PSI_FLAG_THREAD}, -// { &key_memory_prune_partitions_exec, "prune_partitions::exec", 0}, { &key_memory_binlog_recover_exec, "MYSQL_BIN_LOG::recover", 0}, { &key_memory_blob_mem_storage, "Blob_mem_storage::storage", 0}, { &key_memory_NAMED_ILINK_name, "NAMED_ILINK::name", 0}, @@ -9822,17 +9811,12 @@ static PSI_memory_info all_server_memory[]= { &key_memory_queue_item, "Queue::queue_item", 0}, { &key_memory_THD_db, "THD::db", 0}, { &key_memory_user_var_entry, "user_var_entry", 0}, -// { &key_memory_Slave_job_group_group_relay_log_name, "Slave_job_group::group_relay_log_name", 0}, { &key_memory_Relay_log_info_group_relay_log_name, "Relay_log_info::group_relay_log_name", 0}, { &key_memory_binlog_cache_mngr, "binlog_cache_mngr", 0}, { &key_memory_binlog_gtid_index, "binlog_gtid_index", 0}, { &key_memory_Row_data_memory_memory, "Row_data_memory::memory", 0}, -// { &key_memory_Gtid_set_to_string, "Gtid_set::to_string", 0}, -// { &key_memory_Gtid_state_to_string, "Gtid_state::to_string", 0}, -// { &key_memory_Owned_gtids_to_string, "Owned_gtids::to_string", 0}, // { &key_memory_log_event, "Log_event", 0}, // { &key_memory_Incident_log_event_message, "Incident_log_event::message", 0}, -// { &key_memory_Rows_query_log_event_rows_query, "Rows_query_log_event::rows_query", 0}, { &key_memory_Sort_param_tmp_buffer, "Sort_param::tmp_buffer", 0}, { &key_memory_Filesort_info_merge, "Filesort_info::merge", 0}, { &key_memory_Filesort_info_record_pointers, "Filesort_info::record_pointers", 0}, @@ -9845,7 +9829,6 @@ static PSI_memory_info all_server_memory[]= { &key_memory_User_level_lock, "User_level_lock", 0}, { &key_memory_MYSQL_LOG_name, "MYSQL_LOG::name", 0}, { &key_memory_TC_LOG_MMAP_pages, "TC_LOG_MMAP::pages", 0}, -// { &key_memory_my_bitmap_map, "my_bitmap_map", 0}, { &key_memory_QUICK_RANGE_SELECT_mrr_buf_desc, "QUICK_RANGE_SELECT::mrr_buf_desc", 0}, { &key_memory_Event_queue_element_for_exec_names, "Event_queue_element_for_exec::names", 0}, { &key_memory_my_str_malloc, "my_str_malloc", 0}, @@ -9856,39 +9839,21 @@ static PSI_memory_info all_server_memory[]= { &key_memory_rpl_filter, "rpl_filter memory", 0}, { &key_memory_errmsgs, "errmsgs", 0}, { &key_memory_Gis_read_stream_err_msg, "Gis_read_stream::err_msg", 0}, -// { &key_memory_Geometry_objects_data, "Geometry::ptr_and_wkb_data", 0}, { &key_memory_MYSQL_LOCK, "MYSQL_LOCK", 0}, // { &key_memory_NET_buff, "NET::buff", 0}, // { &key_memory_NET_compress_packet, "NET::compress_packet", 0}, { &key_memory_Event_scheduler_scheduler_param, "Event_scheduler::scheduler_param", 0}, -// { &key_memory_Gtid_set_Interval_chunk, "Gtid_set::Interval_chunk", 0}, -// { &key_memory_Owned_gtids_sidno_to_hash, "Owned_gtids::sidno_to_hash", 0}, -// { &key_memory_Sid_map_Node, "Sid_map::Node", 0}, -// { &key_memory_Gtid_state_group_commit_sidno, "Gtid_state::group_commit_sidno_locks", 0}, -// { &key_memory_Mutex_cond_array_Mutex_cond, "Mutex_cond_array::Mutex_cond", 0}, { &key_memory_TABLE_RULE_ENT, "TABLE_RULE_ENT", 0}, -// { &key_memory_Rpl_info_table, "Rpl_info_table", 0}, { &key_memory_Rpl_info_file_buffer, "Rpl_info_file::buffer", 0}, -// { &key_memory_db_worker_hash_entry, "db_worker_hash_entry", 0}, -// { &key_memory_rpl_slave_check_temp_dir, "rpl_slave::check_temp_dir", 0}, -// { &key_memory_rpl_slave_command_buffer, "rpl_slave::command_buffer", 0}, { &key_memory_binlog_ver_1_event, "binlog_ver_1_event", 0}, { &key_memory_SLAVE_INFO, "SLAVE_INFO", 0}, { &key_memory_binlog_pos, "binlog_pos", 0}, -// { &key_memory_HASH_ROW_ENTRY, "HASH_ROW_ENTRY", 0}, { &key_memory_binlog_statement_buffer, "binlog_statement_buffer", 0}, -// { &key_memory_partition_syntax_buffer, "partition_syntax_buffer", 0}, -// { &key_memory_READ_INFO, "READ_INFO", 0}, { &key_memory_JOIN_CACHE, "JOIN_CACHE", 0}, -// { &key_memory_TABLE_sort_io_cache, "TABLE::sort_io_cache", 0}, -// { &key_memory_frm, "frm", 0}, { &key_memory_Unique_sort_buffer, "Unique::sort_buffer", 0}, { &key_memory_Unique_merge_buffer, "Unique::merge_buffer", 0}, { &key_memory_TABLE, "TABLE", PSI_FLAG_GLOBAL}, /* Table cache */ -// { &key_memory_frm_extra_segment_buff, "frm::extra_segment_buff", 0}, -// { &key_memory_frm_form_pos, "frm::form_pos", 0}, { &key_memory_frm_string, "frm::string", 0}, -// { &key_memory_LOG_name, "LOG_name", 0}, { &key_memory_DATE_TIME_FORMAT, "DATE_TIME_FORMAT", 0}, { &key_memory_DDL_LOG_MEMORY_ENTRY, "DDL_LOG_MEMORY_ENTRY", 0}, { &key_memory_ST_SCHEMA_TABLE, "ST_SCHEMA_TABLE", 0}, @@ -9896,30 +9861,15 @@ static PSI_memory_info all_server_memory[]= { &key_memory_PROFILE, "PROFILE", 0}, { &key_memory_global_system_variables, "global_system_variables", 0}, { &key_memory_THD_variables, "THD::variables", 0}, -// { &key_memory_Security_context, "Security_context", 0}, -// { &key_memory_shared_memory_name, "Shared_memory_name", 0}, { &key_memory_bison_stack, "bison_stack", 0}, { &key_memory_THD_handler_tables_hash, "THD::handler_tables_hash", 0}, { &key_memory_hash_index_key_buffer, "hash_index_key_buffer", 0}, { &key_memory_dboptions_hash, "dboptions_hash", 0}, { &key_memory_dbnames_cache, "dbnames_cache", 0}, { &key_memory_user_conn, "user_conn", 0}, -// { &key_memory_LOG_POS_COORD, "LOG_POS_COORD", 0}, -// { &key_memory_XID_STATE, "XID_STATE", 0}, { &key_memory_MPVIO_EXT_auth_info, "MPVIO_EXT::auth_info", 0}, -// { &key_memory_opt_bin_logname, "opt_bin_logname", 0}, { &key_memory_Query_cache, "Query_cache", PSI_FLAG_GLOBAL}, -// { &key_memory_READ_RECORD_cache, "READ_RECORD_cache", 0}, -// { &key_memory_Quick_ranges, "Quick_ranges", 0}, -// { &key_memory_File_query_log_name, "File_query_log::name", 0}, { &key_memory_Table_trigger_dispatcher, "Table_trigger_dispatcher::m_mem_root", 0}, -// { &key_memory_thd_timer, "thd_timer", 0}, -// { &key_memory_THD_Session_tracker, "THD::Session_tracker", 0}, -// { &key_memory_THD_Session_sysvar_resource_manager, "THD::Session_sysvar_resource_manager", 0}, -// { &key_memory_show_slave_status_io_gtid_set, "show_slave_status_io_gtid_set", 0}, -// { &key_memory_write_set_extraction, "write_set_extraction", 0}, -// { &key_memory_get_all_tables, "get_all_tables", 0}, -// { &key_memory_fill_schema_schemata, "fill_schema_schemata", 0}, { &key_memory_native_functions, "native_functions", PSI_FLAG_GLOBAL}, { &key_memory_WSREP, "wsrep", 0 } }; diff --git a/sql/mysqld.h b/sql/mysqld.h index eca68d07d35..b9d9e216594 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -108,14 +108,11 @@ void temp_pool_clear_bit(uint bit); uint temp_pool_set_next(); extern bool opt_large_files; -extern bool opt_update_log, opt_bin_log, opt_error_log, opt_bin_log_compress; +extern bool opt_bin_log, opt_error_log, opt_bin_log_compress; extern uint opt_bin_log_compress_min_len; extern my_bool opt_log, opt_bootstrap; -extern my_bool opt_backup_history_log; -extern my_bool opt_backup_progress_log; extern my_bool opt_support_flashback; extern ulonglong log_output_options; -extern ulong log_backup_output_options; extern bool opt_disable_networking, opt_skip_show_db; extern bool opt_skip_name_resolve; extern bool opt_ignore_builtin_innodb; @@ -123,7 +120,7 @@ extern my_bool opt_character_set_client_handshake; extern my_bool debug_assert_on_not_freed_memory; extern MYSQL_PLUGIN_IMPORT bool volatile abort_loop; extern my_bool opt_safe_user_create; -extern my_bool opt_safe_show_db, opt_local_infile, opt_myisam_use_mmap; +extern my_bool opt_local_infile, opt_myisam_use_mmap; extern my_bool opt_slave_compressed_protocol, use_temp_pool; extern ulong slave_exec_mode_options, slave_ddl_exec_mode_options; extern ulong slave_retried_transactions; @@ -139,15 +136,11 @@ extern my_bool opt_secure_auth; extern my_bool opt_require_secure_transport; extern const char *current_dbug_option; extern char* opt_secure_file_priv; -extern char* opt_secure_backup_file_priv; -extern size_t opt_secure_backup_file_priv_len; 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 const char *shared_memory_base_name; extern MYSQL_PLUGIN_IMPORT char *mysqld_unix_port; -extern my_bool opt_enable_shared_memory; extern ulong opt_replicate_events_marked_for_skip; extern char *default_tz_name; extern Time_zone *default_tz; @@ -168,21 +161,17 @@ extern uint sync_binlog_period, sync_relaylog_period, sync_relayloginfo_period, sync_masterinfo_period; extern ulong opt_tc_log_size, tc_log_max_pages_used, tc_log_page_size; extern ulong tc_log_page_waits; -extern my_bool relay_log_purge, opt_innodb_safe_binlog, opt_innodb; +extern my_bool relay_log_purge; extern my_bool relay_log_recovery; extern uint select_errors,ha_open_options; extern ulonglong test_flags; -extern uint protocol_version, dropping_tables; +extern uint protocol_version; extern MYSQL_PLUGIN_IMPORT uint mysqld_port; extern ulong delay_key_write_options; extern char *opt_logname, *opt_slow_logname, *opt_bin_logname, *opt_relay_logname; extern char *opt_binlog_index_name; extern my_bool opt_binlog_legacy_event_pos; -extern char *opt_backup_history_logname, *opt_backup_progress_logname, - *opt_backup_settings_name; -extern const char *log_output_str; -extern const char *log_backup_output_str; /* System Versioning begin */ enum vers_system_time_t @@ -205,8 +194,7 @@ struct vers_asof_timestamp_t enum vers_alter_history_enum { - VERS_ALTER_HISTORY_ERROR= 0, - VERS_ALTER_HISTORY_KEEP + VERS_ALTER_HISTORY_ERROR= 0 }; /* System Versioning end */ @@ -214,11 +202,8 @@ extern char *mysql_home_ptr, *pidfile_name_ptr; extern MYSQL_PLUGIN_IMPORT char glob_hostname[FN_REFLEN]; extern char mysql_home[FN_REFLEN]; extern char pidfile_name[FN_REFLEN], system_time_zone[30], *opt_init_file; -extern char default_logfile_name[FN_REFLEN]; extern char log_error_file[FN_REFLEN], *opt_tc_log_file, *opt_ddl_recovery_file; extern const double log_10[309]; -extern ulonglong keybuff_size; -extern ulonglong thd_startup_options; extern ulonglong global_max_tmp_space_usage; extern Atomic_counter global_tmp_space_used; extern my_thread_id global_thread_id; @@ -241,9 +226,6 @@ extern MYSQL_PLUGIN_IMPORT ulong max_connections; extern uint max_digest_length; extern ulong max_connect_errors, connect_timeout; extern uint max_password_errors; -extern my_bool slave_allow_batching; -extern my_bool allow_slave_start; -extern LEX_CSTRING reason_slave_blocked; extern ulong slave_trans_retries; extern ulong slave_trans_retry_interval; extern uint slave_net_timeout; @@ -286,7 +268,6 @@ extern MYSQL_PLUGIN_IMPORT MY_TMPDIR mysql_tmpdir_list; extern const char *first_keyword, *delayed_user, *slave_user; extern MYSQL_PLUGIN_IMPORT const char *my_localhost; extern MYSQL_PLUGIN_IMPORT const char **errmesg; /* Error messages */ -extern const char *myisam_recover_options_str; extern const Lex_ident_column in_left_expr_name, in_additional_cond, in_having_cond; extern const LEX_CSTRING NULL_clex_str; extern const LEX_CSTRING error_clex_str; @@ -294,7 +275,6 @@ extern SHOW_VAR status_vars[]; extern struct system_variables max_system_variables; extern struct system_status_var global_status_var; extern struct my_rnd_struct sql_rand; -extern const char *opt_date_time_formats[]; extern handlerton *partition_hton; extern handlerton *myisam_hton; extern handlerton *heap_hton; @@ -308,7 +288,6 @@ extern "C" MYSQL_PLUGIN_IMPORT char **orig_argv; extern pthread_attr_t connection_attrib; extern my_bool old_mode; extern LEX_STRING opt_init_connect, opt_init_slave; -extern char err_shared_dir[]; extern ulong connection_errors_select; extern ulong connection_errors_accept; extern ulong connection_errors_tcpwrap; @@ -338,8 +317,7 @@ extern PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_xid_list, key_delayed_insert_mutex, key_hash_filo_lock, key_LOCK_active_mi, key_LOCK_crypt, key_LOCK_delayed_create, key_LOCK_delayed_insert, key_LOCK_delayed_status, key_LOCK_error_log, - key_LOCK_gdl, key_LOCK_global_system_variables, - key_LOCK_logger, key_LOCK_manager, + key_LOCK_gdl, key_LOCK_global_system_variables, key_LOCK_manager, key_LOCK_prepared_stmt_count, key_LOCK_rpl_status, key_LOCK_server_started, key_LOCK_status, key_LOCK_optimizer_costs, @@ -379,11 +357,10 @@ extern PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger, extern PSI_cond_key key_PAGE_cond, key_COND_active, key_COND_pool; #endif /* HAVE_MMAP */ -extern PSI_cond_key key_BINLOG_COND_xid_list, key_BINLOG_update_cond, +extern PSI_cond_key key_BINLOG_COND_xid_list, key_BINLOG_COND_binlog_background_thread, key_BINLOG_COND_binlog_background_thread_end, - key_COND_cache_status_changed, key_COND_manager, - key_COND_rpl_status, key_COND_server_started, + key_COND_cache_status_changed, key_COND_manager, key_COND_server_started, key_delayed_insert_cond, key_delayed_insert_cond_client, key_item_func_sleep_cond, key_master_info_data_cond, key_master_info_start_cond, key_master_info_stop_cond, @@ -405,7 +382,7 @@ extern PSI_cond_key key_COND_wait_gtid, key_COND_gtid_ignore_duplicates; extern PSI_cond_key key_TABLE_SHARE_COND_rotation; extern PSI_thread_key key_thread_delayed_insert, - key_thread_handle_manager, key_thread_kill_server, key_thread_main, + key_thread_handle_manager, key_thread_main, key_thread_one_connection, key_thread_signal_hand, key_thread_slave_background, key_rpl_parallel_thread; @@ -438,32 +415,21 @@ void init_server_psi_keys(); extern PSI_memory_key key_memory_locked_table_list; extern PSI_memory_key key_memory_locked_thread_list; extern PSI_memory_key key_memory_thd_transactions; -extern PSI_memory_key key_memory_delegate; extern PSI_memory_key key_memory_acl_mem; extern PSI_memory_key key_memory_acl_memex; extern PSI_memory_key key_memory_acl_cache; extern PSI_memory_key key_memory_thd_main_mem_root; -extern PSI_memory_key key_memory_help; -extern PSI_memory_key key_memory_frm; extern PSI_memory_key key_memory_table_share; extern PSI_memory_key key_memory_gdl; extern PSI_memory_key key_memory_table_triggers_list; extern PSI_memory_key key_memory_prepared_statement_map; extern PSI_memory_key key_memory_prepared_statement_main_mem_root; -extern PSI_memory_key key_memory_protocol_rset_root; -extern PSI_memory_key key_memory_warning_info_warn_root; extern PSI_memory_key key_memory_sp_cache; extern PSI_memory_key key_memory_sp_head_main_root; extern PSI_memory_key key_memory_sp_head_execute_root; extern PSI_memory_key key_memory_sp_head_call_root; extern PSI_memory_key key_memory_table_mapping_root; extern PSI_memory_key key_memory_quick_range_select_root; -extern PSI_memory_key key_memory_quick_index_merge_root; -extern PSI_memory_key key_memory_quick_ror_intersect_select_root; -extern PSI_memory_key key_memory_quick_ror_union_select_root; -extern PSI_memory_key key_memory_quick_group_min_max_select_root; -extern PSI_memory_key key_memory_test_quick_select_exec; -extern PSI_memory_key key_memory_prune_partitions_exec; extern PSI_memory_key key_memory_binlog_recover_exec; extern PSI_memory_key key_memory_blob_mem_storage; @@ -471,7 +437,6 @@ extern PSI_memory_key key_memory_Sys_var_charptr_value; extern PSI_memory_key key_memory_THD_db; extern PSI_memory_key key_memory_user_var_entry; extern PSI_memory_key key_memory_user_var_entry_value; -extern PSI_memory_key key_memory_Slave_job_group_group_relay_log_name; extern PSI_memory_key key_memory_Relay_log_info_group_relay_log_name; extern PSI_memory_key key_memory_binlog_cache_mngr; extern PSI_memory_key key_memory_binlog_gtid_index; @@ -480,7 +445,6 @@ extern PSI_memory_key key_memory_errmsgs; extern PSI_memory_key key_memory_Event_queue_element_for_exec_names; extern PSI_memory_key key_memory_Event_scheduler_scheduler_param; extern PSI_memory_key key_memory_Gis_read_stream_err_msg; -extern PSI_memory_key key_memory_Geometry_objects_data; extern PSI_memory_key key_memory_host_cache_hostname; extern PSI_memory_key key_memory_User_level_lock; extern PSI_memory_key key_memory_Filesort_info_record_pointers; @@ -499,35 +463,21 @@ extern PSI_memory_key key_memory_MYSQL_BIN_LOG_index; extern PSI_memory_key key_memory_MYSQL_RELAY_LOG_basename; extern PSI_memory_key key_memory_MYSQL_RELAY_LOG_index; extern PSI_memory_key key_memory_rpl_filter; -extern PSI_memory_key key_memory_Security_context; extern PSI_memory_key key_memory_NET_buff; extern PSI_memory_key key_memory_NET_compress_packet; -extern PSI_memory_key key_memory_my_bitmap_map; extern PSI_memory_key key_memory_QUICK_RANGE_SELECT_mrr_buf_desc; extern PSI_memory_key key_memory_TABLE_RULE_ENT; -extern PSI_memory_key key_memory_Mutex_cond_array_Mutex_cond; -extern PSI_memory_key key_memory_Owned_gtids_sidno_to_hash; -extern PSI_memory_key key_memory_Sid_map_Node; extern PSI_memory_key key_memory_bison_stack; -extern PSI_memory_key key_memory_TABLE_sort_io_cache; extern PSI_memory_key key_memory_DATE_TIME_FORMAT; extern PSI_memory_key key_memory_DDL_LOG_MEMORY_ENTRY; extern PSI_memory_key key_memory_ST_SCHEMA_TABLE; extern PSI_memory_key key_memory_ignored_db; extern PSI_memory_key key_memory_SLAVE_INFO; -extern PSI_memory_key key_memory_log_event_old; -extern PSI_memory_key key_memory_HASH_ROW_ENTRY; extern PSI_memory_key key_memory_table_def_memory; extern PSI_memory_key key_memory_MPVIO_EXT_auth_info; -extern PSI_memory_key key_memory_LOG_POS_COORD; -extern PSI_memory_key key_memory_XID_STATE; extern PSI_memory_key key_memory_Rpl_info_file_buffer; -extern PSI_memory_key key_memory_Rpl_info_table; extern PSI_memory_key key_memory_binlog_pos; -extern PSI_memory_key key_memory_db_worker_hash_entry; -extern PSI_memory_key key_memory_rpl_slave_command_buffer; extern PSI_memory_key key_memory_binlog_ver_1_event; -extern PSI_memory_key key_memory_rpl_slave_check_temp_dir; extern PSI_memory_key key_memory_TABLE; extern PSI_memory_key key_memory_binlog_statement_buffer; extern PSI_memory_key key_memory_user_conn; @@ -536,34 +486,15 @@ extern PSI_memory_key key_memory_dbnames_cache; extern PSI_memory_key key_memory_hash_index_key_buffer; extern PSI_memory_key key_memory_THD_handler_tables_hash; extern PSI_memory_key key_memory_JOIN_CACHE; -extern PSI_memory_key key_memory_READ_INFO; -extern PSI_memory_key key_memory_partition_syntax_buffer; extern PSI_memory_key key_memory_global_system_variables; extern PSI_memory_key key_memory_THD_variables; extern PSI_memory_key key_memory_PROFILE; -extern PSI_memory_key key_memory_LOG_name; -extern PSI_memory_key key_memory_string_iterator; -extern PSI_memory_key key_memory_frm_extra_segment_buff; -extern PSI_memory_key key_memory_frm_form_pos; extern PSI_memory_key key_memory_frm_string; extern PSI_memory_key key_memory_Unique_sort_buffer; extern PSI_memory_key key_memory_Unique_merge_buffer; -extern PSI_memory_key key_memory_shared_memory_name; -extern PSI_memory_key key_memory_opt_bin_logname; extern PSI_memory_key key_memory_Query_cache; -extern PSI_memory_key key_memory_READ_RECORD_cache; -extern PSI_memory_key key_memory_Quick_ranges; -extern PSI_memory_key key_memory_File_query_log_name; extern PSI_memory_key key_memory_Table_trigger_dispatcher; -extern PSI_memory_key key_memory_show_slave_status_io_gtid_set; -extern PSI_memory_key key_memory_write_set_extraction; -extern PSI_memory_key key_memory_thd_timer; -extern PSI_memory_key key_memory_THD_Session_tracker; -extern PSI_memory_key key_memory_THD_Session_sysvar_resource_manager; -extern PSI_memory_key key_memory_get_all_tables; -extern PSI_memory_key key_memory_fill_schema_schemata; extern PSI_memory_key key_memory_native_functions; -extern PSI_memory_key key_memory_JSON; extern PSI_memory_key key_memory_WSREP; /* @@ -708,7 +639,7 @@ extern PSI_stage_info stage_slave_background_wait_request; extern PSI_stage_info stage_waiting_for_deadlock_kill; extern PSI_stage_info stage_starting; #ifdef WITH_WSREP -// Aditional Galera thread states +// Additional Galera thread states extern PSI_stage_info stage_waiting_isolation; extern PSI_stage_info stage_waiting_certification; extern PSI_stage_info stage_waiting_ddl; @@ -767,7 +698,6 @@ extern char *server_version_ptr; extern MYSQL_PLUGIN_IMPORT char mysql_real_data_home[]; extern char mysql_unpacked_real_data_home[]; extern MYSQL_PLUGIN_IMPORT struct system_variables global_system_variables; -extern char default_logfile_name[FN_REFLEN]; extern char *my_proxy_protocol_networks; #define mysql_tmpdir (my_tmpdir(&mysql_tmpdir_list))