diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-01-15 14:24:11 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-01-15 14:24:11 +0100 |
| commit | 38bcb4464eadc4e2a22e835ef009cbd1f4ae8846 (patch) | |
| tree | 34152244ba9346cbc058119f1ed6d1194d4c7039 /sql/sys_vars.cc | |
| parent | 2f88b14acd9c7ddc0337dd56a1d6ce1a156fe4ce (diff) | |
| download | mariadb-git-38bcb4464eadc4e2a22e835ef009cbd1f4ae8846.tar.gz | |
After-merge fix.
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 6c9921b394a..42bcfa2ee95 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -4489,8 +4489,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); |