1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

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.
This commit is contained in:
Kristian Nielsen
2014-08-20 10:59:39 +02:00
parent 453c29c3f7
commit c6a60f6d79
2 changed files with 12 additions and 5 deletions

View File

@ -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);
};