summaryrefslogtreecommitdiff
path: root/sql/log_event.h
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2015-02-06 10:02:02 +0100
committerKristian Nielsen <knielsen@knielsen-hq.org>2015-02-07 09:42:58 +0100
commit8672339328c30c894b4062f94c4fb0510fb20f9a (patch)
tree684a4dfb1b8269276e3602e3d716683aa369846a /sql/log_event.h
parent734c4c01439488781837196ff09ad5f2c5276ead (diff)
downloadmariadb-git-8672339328c30c894b4062f94c4fb0510fb20f9a.tar.gz
MDEV-6676: Optimistic parallel replication
Adjust the configuration options, as discussed on the maria-developers@ mailing list. The option to hint a transaction to not be replicated in parallel is now called @@skip_parallel_replication, consistent with @@skip_replication. And the --slave-parallel-mode is now simplified to have just one of the following values: none minimal conservative optimistic aggressive This reflects successively harder efforts to find opportunities to run things in parallel on the slave. It allows to extend the server with more automatic heuristics in the future without having to introduce a new configuration option for each and every one.
Diffstat (limited to 'sql/log_event.h')
-rw-r--r--sql/log_event.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index 1cc75e0bd9a..b57ef35aad2 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -3177,8 +3177,8 @@ public:
*/
static const uchar FL_TRANSACTIONAL= 4;
/*
- FL_ALLOW_PARALLEL reflects the value of @@SESSION.replicate_allow_parallel
- at the time of commit.
+ FL_ALLOW_PARALLEL reflects the (negation of the) value of
+ @@SESSION.skip_parallel_replication at the time of commit.
*/
static const uchar FL_ALLOW_PARALLEL= 8;
/*