diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-08-20 10:59:39 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-08-20 10:59:39 +0200 |
| commit | c6a60f6d79862bd82d517a25c6e13e6d141173b6 (patch) | |
| tree | 4104757a24ce4c8bf69fe3ef043c65cb8c4ddc2e /sql/rpl_parallel.h | |
| parent | 453c29c3f772d7bec69be2a2bf5a5747444f0a77 (diff) | |
| download | mariadb-git-c6a60f6d79862bd82d517a25c6e13e6d141173b6.tar.gz | |
MDEV-6321: close_temporary_tables() in format description event not serialised correctly
After-review fixes.
Mainly catching if the wait in wait_for_workers_idle() is aborted due to kill.
In this case, we should return an error and not proceed to execute the format
description event, as other threads might still be running for a bit until the
error is caught in all threads.
Diffstat (limited to 'sql/rpl_parallel.h')
| -rw-r--r-- | sql/rpl_parallel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_parallel.h b/sql/rpl_parallel.h index befe08b3d9b..b114ee4ebcb 100644 --- a/sql/rpl_parallel.h +++ b/sql/rpl_parallel.h @@ -244,7 +244,7 @@ struct rpl_parallel { void wait_for_done(THD *thd, Relay_log_info *rli); void stop_during_until(); bool workers_idle(); - void wait_for_workers_idle(THD *thd); + int wait_for_workers_idle(THD *thd); int do_event(rpl_group_info *serial_rgi, Log_event *ev, ulonglong event_size); }; |