summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorSergeyV@selena. <>2005-10-03 20:34:42 +0400
committerSergeyV@selena. <>2005-10-03 20:34:42 +0400
commit7d0d7826bb8d715f935d954d3bba8ad863a0ebbc (patch)
treeb17d1a566a5575ed3924ecb63801228be96d4018 /sql/sql_class.h
parent78504ac33e1063870aa6cab001229d6aaa74aef7 (diff)
downloadmariadb-git-7d0d7826bb8d715f935d954d3bba8ad863a0ebbc.tar.gz
Fixes bug #13377. Added code to close active log files in case
of log reset condition.
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 7cbfc19123f..903b786d21d 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -189,8 +189,11 @@ class MYSQL_LOG: public TC_LOG
{
private:
/* LOCK_log and LOCK_index are inited by init_pthread_objects() */
- pthread_mutex_t LOCK_log, LOCK_index;
+ pthread_mutex_t LOCK_log, LOCK_index, LOCK_readers;
pthread_cond_t update_cond;
+ pthread_cond_t reset_cond;
+ bool reset_pending;
+ int readers_count;
ulonglong bytes_written;
time_t last_time,query_start;
IO_CACHE log_file;
@@ -334,6 +337,9 @@ public:
int purge_logs_before_date(time_t purge_time);
int purge_first_log(struct st_relay_log_info* rli, bool included);
bool reset_logs(THD* thd);
+ inline bool is_reset_pending() { return reset_pending; }
+ void readers_addref();
+ void readers_release();
void close(uint exiting);
// iterating through the log index file