diff options
Diffstat (limited to 'sql/rpl_mi.cc')
| -rw-r--r-- | sql/rpl_mi.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index f506a3c319d..1165164fd88 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -27,7 +27,7 @@ int init_intvar_from_file(int* var, IO_CACHE* f, int default_val); int init_strvar_from_file(char *var, int max_size, IO_CACHE *f, const char *default_val); -MASTER_INFO::MASTER_INFO() +Master_info::Master_info() :Slave_reporting_capability("I/O"), ssl(0), fd(-1), io_thd(0), inited(0), abort_slave(0),slave_running(0), @@ -45,7 +45,7 @@ MASTER_INFO::MASTER_INFO() pthread_cond_init(&stop_cond, NULL); } -MASTER_INFO::~MASTER_INFO() +Master_info::~Master_info() { pthread_mutex_destroy(&run_lock); pthread_mutex_destroy(&data_lock); @@ -55,7 +55,7 @@ MASTER_INFO::~MASTER_INFO() } -void init_master_info_with_options(MASTER_INFO* mi) +void init_master_info_with_options(Master_info* mi) { DBUG_ENTER("init_master_info_with_options"); @@ -98,7 +98,7 @@ enum { LINES_IN_MASTER_INFO= LINE_FOR_MASTER_SSL_VERIFY_SERVER_CERT }; -int init_master_info(MASTER_INFO* mi, const char* master_info_fname, +int init_master_info(Master_info* mi, const char* master_info_fname, const char* slave_info_fname, bool abort_if_no_master_info_file, int thread_mask) @@ -338,7 +338,7 @@ err: 1 - flush master info failed 0 - all ok */ -int flush_master_info(MASTER_INFO* mi, bool flush_relay_log_cache) +int flush_master_info(Master_info* mi, bool flush_relay_log_cache) { IO_CACHE* file = &mi->file; char lbuf[22]; @@ -392,7 +392,7 @@ int flush_master_info(MASTER_INFO* mi, bool flush_relay_log_cache) } -void end_master_info(MASTER_INFO* mi) +void end_master_info(Master_info* mi) { DBUG_ENTER("end_master_info"); |