diff options
| author | unknown <knielsen@knielsen-hq.org> | 2014-03-04 14:32:42 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2014-03-04 14:32:42 +0100 |
| commit | 5ec49e6452d4c76650c8475e387283fdbe480672 (patch) | |
| tree | b2ee21e1c2b89e9050ea65ac70fc3792f9df7a69 /sql/rpl_parallel.h | |
| parent | 016bd4fc5fff311dc4091b3b7329cd980dbaa14b (diff) | |
| parent | b5b82108497b5beda3b2fbe98ecea178b5e58076 (diff) | |
| download | mariadb-git-5ec49e6452d4c76650c8475e387283fdbe480672.tar.gz | |
Merge MDEV-5754, MDEV-5769, and MDEV-5764 into 10.0
Diffstat (limited to 'sql/rpl_parallel.h')
| -rw-r--r-- | sql/rpl_parallel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/rpl_parallel.h b/sql/rpl_parallel.h index 956a31e4b7f..c4bb407e5eb 100644 --- a/sql/rpl_parallel.h +++ b/sql/rpl_parallel.h @@ -222,10 +222,10 @@ struct rpl_parallel { ~rpl_parallel(); void reset(); rpl_parallel_entry *find(uint32 domain_id); - void wait_for_done(THD *thd); + void wait_for_done(THD *thd, Relay_log_info *rli); + void stop_during_until(); bool workers_idle(); - bool do_event(rpl_group_info *serial_rgi, Log_event *ev, - ulonglong event_size); + int do_event(rpl_group_info *serial_rgi, Log_event *ev, ulonglong event_size); }; |