diff options
author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-08-16 07:37:50 +0200 |
---|---|---|
committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-08-16 07:37:50 +0200 |
commit | 044a4a3e06fb8019e2af1fb6a8c9f783c1a407cf (patch) | |
tree | 60e368275522a93827d2542c48a28dede4305037 /sql/rpl_rli.h | |
parent | d287334638972435bcd0664a5ce62658ef8233b7 (diff) | |
download | mariadb-git-044a4a3e06fb8019e2af1fb6a8c9f783c1a407cf.tar.gz |
Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
(and be more friendly to Doxygen by removing unnecessary typedefs).
sql/log.cc:
Renaming struct st_relay_log_info to class Relay_log_info.
sql/log.h:
Renaming struct st_relay_log_info to class Relay_log_info.
sql/log_event.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/log_event.h:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
Removing typedef RELAY_LOG_INFO.
sql/log_event_old.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/log_event_old.h:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_mi.h:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_record.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_record.h:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_record_old.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_record_old.h:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_rli.cc:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_rli.h:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
Removing typedef RELAY_LOG_INFO.
sql/rpl_utility.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/rpl_utility.h:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
Removing typedef RELAY_LOG_INFO.
sql/slave.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/slave.h:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
Removing typedef RELAY_LOG_INFO.
sql/sql_binlog.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
sql/sql_class.h:
Renaming struct st_relay_log_info to class Relay_log_info.
Renaming RELAY_LOG_INFO to Relay_log_info.
Removing typedef RELAY_LOG_INFO.
sql/sql_repl.cc:
Renaming RELAY_LOG_INFO to Relay_log_info.
Diffstat (limited to 'sql/rpl_rli.h')
-rw-r--r-- | sql/rpl_rli.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 7ae21897e3f..17b807e9882 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. */ @@ -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 */ |