diff options
Diffstat (limited to 'sql/rpl_rli.h')
| -rw-r--r-- | sql/rpl_rli.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 7ae21897e3f..c19b84ced49 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -27,16 +27,16 @@ struct RPL_TABLE_LIST; Replication SQL Thread - st_relay_log_info contains: + Relay_log_info contains: - the current relay log - the current relay log offset - master log name - master log sequence corresponding to the last update - misc information specific to the SQL thread - st_relay_log_info is initialized from the slave.info file if such exists. - Otherwise, data members are intialized with defaults. The initialization is - done with init_relay_log_info() call. + Relay_log_info is initialized from the slave.info file if such + exists. Otherwise, data members are intialized with defaults. The + initialization is done with init_relay_log_info() call. The format of slave.info file: @@ -49,8 +49,9 @@ struct RPL_TABLE_LIST; *****************************************************************************/ -typedef struct st_relay_log_info : public Slave_reporting_capability +class Relay_log_info : public Slave_reporting_capability { +public: /** Flags for the state of the replication. */ @@ -120,8 +121,8 @@ typedef struct st_relay_log_info : public Slave_reporting_capability */ pthread_cond_t start_cond, stop_cond, data_cond; - /* parent MASTER_INFO structure */ - class MASTER_INFO *mi; + /* parent Master_info structure */ + Master_info *mi; /* Needed to deal properly with cur_log getting closed and re-opened with @@ -255,8 +256,8 @@ typedef struct st_relay_log_info : public Slave_reporting_capability char ign_master_log_name_end[FN_REFLEN]; ulonglong ign_master_log_pos_end; - st_relay_log_info(); - ~st_relay_log_info(); + Relay_log_info(); + ~Relay_log_info(); /* Invalidate cached until_log_name and group_relay_log_name comparison @@ -391,11 +392,11 @@ typedef struct st_relay_log_info : public Slave_reporting_capability private: uint32 m_flags; -} RELAY_LOG_INFO; +}; // Defined in rpl_rli.cc -int init_relay_log_info(RELAY_LOG_INFO* rli, const char* info_fname); +int init_relay_log_info(Relay_log_info* rli, const char* info_fname); #endif /* RPL_RLI_H */ |