diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 4bb0e0cad88..e620903d2ee 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -543,7 +543,6 @@ ulong slow_launch_threads = 0; uint sync_binlog_period= 0, sync_relaylog_period= 0, sync_relayloginfo_period= 0, sync_masterinfo_period= 0; ulong expire_logs_days = 0; -ulong rpl_recovery_rank=0; /** Soft upper limit for number of sp_head objects that can be stored in the sp_cache for one connection. diff --git a/sql/mysqld.h b/sql/mysqld.h index 4e33a0011e2..4991401694e 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -256,7 +256,7 @@ extern ulonglong max_binlog_cache_size, max_binlog_stmt_cache_size; extern ulong max_binlog_size; extern ulong slave_max_allowed_packet; extern ulong opt_binlog_rows_event_max_size; -extern ulong rpl_recovery_rank, thread_cache_size; +extern ulong thread_cache_size; extern ulong stored_program_cache_size; extern ulong opt_slave_parallel_threads; extern ulong opt_slave_domain_parallel_threads; diff --git a/sql/sql_repl.h b/sql/sql_repl.h index 8d9a127bca7..dd8d8e8b9f0 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -24,7 +24,7 @@ typedef struct st_slave_info { uint32 server_id; - uint32 rpl_recovery_rank, master_id; + uint32 master_id; char host[HOSTNAME_LENGTH*SYSTEM_CHARSET_MBMAXLEN+1]; char user[USERNAME_LENGTH+1]; char password[MAX_PASSWORD_LENGTH*SYSTEM_CHARSET_MBMAXLEN+1];