diff options
| author | unknown <SergeyV@selena.> | 2005-11-14 16:01:10 +0300 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2005-11-14 16:01:10 +0300 |
| commit | 303cae4cd86db752a25836bb743796dd7d71dcf2 (patch) | |
| tree | 8ad0a87b2049632526ae5cc48281ed997248d76c /sql/sql_class.h | |
| parent | b10c7d60bd46135760c59291415c49db6e8d8f71 (diff) | |
| download | mariadb-git-303cae4cd86db752a25836bb743796dd7d71dcf2.tar.gz | |
Fixes bug #13377. my_open() & my_create() functions changed to use
my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to
allow deleting opened files. my_sopen() implementation is added to
support this functionality.
include/my_global.h:
Fixes bug #13377. Added number of constants for share delete file
open option.
include/my_sys.h:
Fixes bug #13377. Added my_sopen function.
mysys/my_create.c:
Fixes bug #13377. my_create() function changed to use my_sopen() and which allows
to use FILE_SHARE_DELETE flag on win32, which helps in deleting opened files.
mysys/my_open.c:
Fixes bug #13377. my_open() function changed to use my_sopen() on win32
which allows to use FILE_SHARE_DELETE flag to allow deleting opened files.
sql/log.cc:
Fixes bug #13377. Additional patch - remove reference counting for
opened binlog files, introduced in initial patch of #13377.
sql/sql_class.h:
Fixes bug #13377. Additional patch - remove reference counting for
opened binlog files, introduced in initial patch of #13377.
sql/sql_repl.cc:
Fixes bug #13377. Additional patch - remove reference counting for
opened binlog files, introduced in initial patch of #13377.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 2d1880a6d9d..eaa8291e697 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -189,11 +189,10 @@ 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, LOCK_readers; + pthread_mutex_t LOCK_log, LOCK_index; pthread_mutex_t LOCK_prep_xids; pthread_cond_t COND_prep_xids; pthread_cond_t update_cond; - pthread_cond_t reset_cond; ulonglong bytes_written; time_t last_time,query_start; IO_CACHE log_file; @@ -335,9 +334,6 @@ 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 |