diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-17 15:18:44 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-17 15:18:44 +0200 |
| commit | 167332597f03f73057fbb4684687a013596181bd (patch) | |
| tree | 1256610eb3a54a2e6f847badea452e3fc274a5c0 /sql/rpl_parallel.h | |
| parent | 8125db1d9ae489162f08560f42c60c10a316afbc (diff) | |
| parent | 702fdc52fa02c5f20004d169ad48494122d8ffed (diff) | |
| download | mariadb-git-167332597f03f73057fbb4684687a013596181bd.tar.gz | |
Merge 10.0 -> 10.1.
Conflicts:
mysql-test/suite/multi_source/multisource.result
sql/sql_base.cc
Diffstat (limited to 'sql/rpl_parallel.h')
| -rw-r--r-- | sql/rpl_parallel.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/rpl_parallel.h b/sql/rpl_parallel.h index cddc8e5dd07..4734f0ca51e 100644 --- a/sql/rpl_parallel.h +++ b/sql/rpl_parallel.h @@ -227,7 +227,6 @@ struct rpl_parallel_thread_pool { struct rpl_parallel_thread *free_list; mysql_mutex_t LOCK_rpl_thread_pool; mysql_cond_t COND_rpl_thread_pool; - bool changing; bool inited; rpl_parallel_thread_pool(); @@ -337,9 +336,8 @@ struct rpl_parallel { extern struct rpl_parallel_thread_pool global_rpl_thread_pool; -extern int rpl_parallel_change_thread_count(rpl_parallel_thread_pool *pool, - uint32 new_count, - bool skip_check= false); +extern int rpl_parallel_activate_pool(rpl_parallel_thread_pool *pool); +extern int rpl_parallel_inactivate_pool(rpl_parallel_thread_pool *pool); extern bool process_gtid_for_restart_pos(Relay_log_info *rli, rpl_gtid *gtid); #endif /* RPL_PARALLEL_H */ |