diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-11-15 23:00:11 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-11-15 23:00:11 +0100 |
| commit | f1fcc1fc105ad0e329b8f6dd11923f99d6edd42b (patch) | |
| tree | b405dd16ccd817e8aa76aec46ae5e1ccd73f0269 /sql/sys_vars.cc | |
| parent | 9a090728805720fb10697267531235cfbac651f4 (diff) | |
| download | mariadb-git-f1fcc1fc105ad0e329b8f6dd11923f99d6edd42b.tar.gz | |
Back-port Master_info::using_parallel() to 10.0.
This has no functional changes, but it helps avoid merge problems from 10.0
to 10.1. In 10.0, code that checks for parallel replication uses
opt_slave_parallel_threads > 0, but this check needs to be
mi->using_parallel() in 10.1. By using the same check in 10.0 (with
unchanged semantics), merge problems to 10.1 are avoided.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 689d35c9cc3..089b6cd9c7e 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -4351,8 +4351,7 @@ static bool update_slave_skip_counter(sys_var *self, THD *thd, Master_info *mi) mi->connection_name.str); return true; } - if (mi->using_gtid != Master_info::USE_GTID_NO && - opt_slave_parallel_threads > 0) + if (mi->using_gtid != Master_info::USE_GTID_NO && mi->using_parallel()) { ulong domain_count; mysql_mutex_lock(&rpl_global_gtid_slave_state->LOCK_slave_state); |