diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-09-29 14:16:23 +0300 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-09-29 14:16:23 +0300 |
| commit | 5983785ef4b04b865ea1d78c8d452642913a83f3 (patch) | |
| tree | f79e672485606b6da384195da6a4c1c6729ed362 /sql/log.h | |
| parent | 5d2f79def9b67dd5400411070d47f8180ceb072b (diff) | |
| download | mariadb-git-5983785ef4b04b865ea1d78c8d452642913a83f3.tar.gz | |
WL#342 heartbeat
backporting from 6.0 code base to 5.1.
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/log.h b/sql/log.h index d306d6f7182..8d6a90d8a35 100644 --- a/sql/log.h +++ b/sql/log.h @@ -284,7 +284,7 @@ public: /* This is relay log */ bool is_relay_log; - + ulong signal_cnt; // update of the counter is checked by heartbeat /* These describe the log's format. This is used only for relay logs. _for_exec is used by the SQL thread, _for_queue by the I/O thread. It's @@ -339,7 +339,8 @@ public: } void set_max_size(ulong max_size_arg); void signal_update(); - void wait_for_update(THD* thd, bool master_or_slave); + void wait_for_update_relay_log(THD* thd); + int wait_for_update_bin_log(THD* thd, const struct timespec * timeout); void set_need_start_event() { need_start_event = 1; } void init(bool no_auto_events_arg, ulong max_size); void init_pthread_objects(); |