summaryrefslogtreecommitdiff
path: root/mysql-test/include/check-testcase.test
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 /mysql-test/include/check-testcase.test
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 'mysql-test/include/check-testcase.test')
-rw-r--r--mysql-test/include/check-testcase.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test
index 9bba18b170b..083f44ce966 100644
--- a/mysql-test/include/check-testcase.test
+++ b/mysql-test/include/check-testcase.test
@@ -66,7 +66,7 @@ if ($tmp)
--echo Gtid_IO_Pos #
--echo Replicate_Do_Domain_Ids
--echo Replicate_Ignore_Domain_Ids
- --echo Parallel_Mode domain,follow_master_commit
+ --echo Parallel_Mode conservative
}
if (!$tmp) {
# Note: after WL#5177, fields 13-18 shall not be filtered-out.