diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-07-03 09:33:41 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-07-03 09:33:41 +0200 |
| commit | 1d91910b944a801a2bbe138d4258c53eaeb0c473 (patch) | |
| tree | 76f2ed8b5bb2c9e44eea7cc0366d8d1d7a070966 /sql/rpl_parallel.cc | |
| parent | 176000a54ceb8dabe8f8b985aff565dfae6fb0df (diff) | |
| parent | 95e09f0766f037530d2dcfbb6c530137a4ee0db4 (diff) | |
| download | mariadb-git-1d91910b944a801a2bbe138d4258c53eaeb0c473.tar.gz | |
MDEV-12179: Per-engine mysql.gtid_slave_pos table
Merge into MariaDB 10.3.
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; } |