diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-08-16 08:52:50 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-08-16 08:52:50 +0200 |
| commit | 9a7658a3c25f03417580b92e93591864e9e32ed6 (patch) | |
| tree | 5b834668a43070a4ce118cd314f79d229abc5a76 /sql/rpl_mi.h | |
| parent | 044a4a3e06fb8019e2af1fb6a8c9f783c1a407cf (diff) | |
| download | mariadb-git-9a7658a3c25f03417580b92e93591864e9e32ed6.tar.gz | |
Renaming MASTER_INFO to Master_info in order to follow the coding
standards (and help Doxygen generating good documentation).
sql/ha_ndbcluster.cc:
Renaming MASTER_INFO to Master_info.
sql/log_event.cc:
Renaming MASTER_INFO to Master_info.
sql/repl_failsafe.cc:
Renaming MASTER_INFO to Master_info.
sql/repl_failsafe.h:
Renaming MASTER_INFO to Master_info.
sql/rpl_mi.cc:
Renaming MASTER_INFO to Master_info.
sql/rpl_mi.h:
Renaming MASTER_INFO to Master_info.
sql/rpl_rli.h:
Renaming MASTER_INFO to Master_info.
sql/slave.cc:
Renaming MASTER_INFO to Master_info.
sql/slave.h:
Renaming MASTER_INFO to Master_info.
sql/sql_repl.cc:
Renaming MASTER_INFO to Master_info.
sql/sql_repl.h:
Renaming MASTER_INFO to Master_info.
Diffstat (limited to 'sql/rpl_mi.h')
| -rw-r--r-- | sql/rpl_mi.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h index 5e2326fc010..93fb0a98198 100644 --- a/sql/rpl_mi.h +++ b/sql/rpl_mi.h @@ -26,13 +26,13 @@ Replication IO Thread - MASTER_INFO contains: + Master_info contains: - information about how to connect to a master - current master log name - current master log offset - misc control variables - MASTER_INFO is initialized once from the master.info file if such + Master_info is initialized once from the master.info file if such exists. Otherwise, data members corresponding to master.info fields are initialized with defaults specified by master-* options. The initialization is done through init_master_info() call. @@ -55,11 +55,11 @@ *****************************************************************************/ -class MASTER_INFO : public Slave_reporting_capability +class Master_info : public Slave_reporting_capability { public: - MASTER_INFO(); - ~MASTER_INFO(); + Master_info(); + ~Master_info(); /* the variables below are needed because we can change masters on the fly */ char master_log_name[FN_REFLEN]; @@ -102,13 +102,13 @@ class MASTER_INFO : public Slave_reporting_capability long clock_diff_with_master; }; -void init_master_info_with_options(MASTER_INFO* mi); -int init_master_info(MASTER_INFO* mi, const char* master_info_fname, +void init_master_info_with_options(Master_info* mi); +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); -void end_master_info(MASTER_INFO* mi); -int flush_master_info(MASTER_INFO* mi, bool flush_relay_log_cache); +void end_master_info(Master_info* mi); +int flush_master_info(Master_info* mi, bool flush_relay_log_cache); #endif /* HAVE_REPLICATION */ #endif /* RPL_MI_H */ |