diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-06-26 18:29:30 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-06-26 18:29:30 +0300 |
| commit | de209ca4a10385a392e3596c80187b88434b6fe5 (patch) | |
| tree | 8776f639a549bac2e133579b6ce6a1335aa5a477 /sql/rpl_parallel.cc | |
| parent | 2a3fe45dd2df047cc0d66e2bcdbadd5005c85a1a (diff) | |
| download | mariadb-git-bb-10.3-mdev12179.tar.gz | |
MDEV-12179: Per-engine mysql.gtid_slave_pos tablesbb-10.3-mdev12179
Merge to 10.3
- changed a few LEX_STRING to LEX_CSTRING
Diffstat (limited to 'sql/rpl_parallel.cc')
| -rw-r--r-- | sql/rpl_parallel.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index aaa72da29db..0994bce4f7a 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -1466,7 +1466,7 @@ rpl_parallel_change_thread_count(rpl_parallel_thread_pool *pool, */ if (!new_count && !force) { - if (any_slave_sql_running()) + if (any_slave_sql_running(false)) { DBUG_PRINT("warning", ("SQL threads running while trying to reset parallel pool")); @@ -1621,7 +1621,7 @@ err: int rpl_parallel_resize_pool_if_no_slaves(void) { /* master_info_index is set to NULL on shutdown */ - if (opt_slave_parallel_threads > 0 && !any_slave_sql_running()) + if (opt_slave_parallel_threads > 0 && !any_slave_sql_running(false)) return rpl_parallel_inactivate_pool(&global_rpl_thread_pool); return 0; } |