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/rpl_mi.h | |
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/rpl_mi.h')
-rw-r--r-- | sql/rpl_mi.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h index a27672e4c90..e58df0150f5 100644 --- a/sql/rpl_mi.h +++ b/sql/rpl_mi.h @@ -75,6 +75,10 @@ class Master_info : public Slave_reporting_capability return connection_name.str == 0; } static const char *using_gtid_astext(enum enum_using_gtid arg); + bool using_parallel() + { + return opt_slave_parallel_threads > 0; + } /* the variables below are needed because we can change masters on the fly */ char master_log_name[FN_REFLEN+6]; /* Room for multi-*/ |