diff options
| author | Monty <monty@mariadb.org> | 2015-11-23 19:58:30 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-11-23 19:58:30 +0200 |
| commit | b30a768e7bcaf926cfacc4b617338184e8d72fe3 (patch) | |
| tree | 142819f3748701d8bd88d6c1168e071567b7004e /sql/rpl_parallel.h | |
| parent | 72dc30f21701cc93f46efaa0018413bb71af5211 (diff) | |
| download | mariadb-git-b30a768e7bcaf926cfacc4b617338184e8d72fe3.tar.gz | |
Fixed failures in rpl_parallel2
Problem was that we used same condition variable with 2 different mutex.
Fixed by changing to use COND_rpl_thread_stop instead of COND_parallel_entry
for stopping threads.
Patch by Kristian Nielsen
Diffstat (limited to 'sql/rpl_parallel.h')
| -rw-r--r-- | sql/rpl_parallel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/rpl_parallel.h b/sql/rpl_parallel.h index 262bd86702f..3012daa8763 100644 --- a/sql/rpl_parallel.h +++ b/sql/rpl_parallel.h @@ -74,6 +74,7 @@ struct rpl_parallel_thread { mysql_mutex_t LOCK_rpl_thread; mysql_cond_t COND_rpl_thread; mysql_cond_t COND_rpl_thread_queue; + mysql_cond_t COND_rpl_thread_stop; struct rpl_parallel_thread *next; /* For free list. */ struct rpl_parallel_thread_pool *pool; THD *thd; |