diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-08-17 11:00:03 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-08-17 11:00:03 +0200 |
| commit | dc4f7044785178a56ddc03a7832af1566fbb9e25 (patch) | |
| tree | e0fe962a0f8ed8d699d8be6d17dd26f854ede129 /sql/log.h | |
| parent | 8f8eab9c028d18da22af0ac330d022959a2f1c1b (diff) | |
| parent | 29393eafdbe87f14d9885ef875b81d7529025c86 (diff) | |
| download | mariadb-git-dc4f7044785178a56ddc03a7832af1566fbb9e25.tar.gz | |
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/log_event.cc:
Manual merge.
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log.h b/sql/log.h index c116c4a93f7..e597c986794 100644 --- a/sql/log.h +++ b/sql/log.h @@ -16,7 +16,7 @@ #ifndef LOG_H #define LOG_H -struct st_relay_log_info; +class Relay_log_info; class Format_description_log_event; @@ -121,7 +121,7 @@ extern TC_LOG_DUMMY tc_log_dummy; #define LOG_CLOSE_TO_BE_OPENED 2 #define LOG_CLOSE_STOP_EVENT 4 -struct st_relay_log_info; +class Relay_log_info; typedef struct st_log_info { @@ -362,7 +362,7 @@ public: bool need_mutex, bool need_update_threads, ulonglong *decrease_log_space); int purge_logs_before_date(time_t purge_time); - int purge_first_log(struct st_relay_log_info* rli, bool included); + int purge_first_log(Relay_log_info* rli, bool included); bool reset_logs(THD* thd); void close(uint exiting); |