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/log_event.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/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 4a1d13a8004..d311297f8a8 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -12829,7 +12829,7 @@ bool rpl_get_position_info(const char **log_file_name, ulonglong *log_pos, return FALSE; #else const Relay_log_info *rli= &(active_mi->rli); - if (opt_slave_parallel_threads == 0) + if (!rli->mi->using_parallel()) { *log_file_name= rli->group_master_log_name; *log_pos= rli->group_master_log_pos + |