summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help.result
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2016-01-26 15:15:13 +0100
committerKristian Nielsen <knielsen@knielsen-hq.org>2016-01-29 18:41:15 +0100
commit121dc271b0c73822eae5bb39a741490b70c8d39b (patch)
tree3a07e55f089f93dd2933a48338de079be8a182b2 /mysql-test/r/mysqld--help.result
parent7b50447aa6d051b8d14bb01ef14802cb8ffee223 (diff)
downloadmariadb-git-121dc271b0c73822eae5bb39a741490b70c8d39b.tar.gz
Make --slave-parallel-workers an alias for --slave-parallel-threads
This is to add compatibility with the similar MySQL option.
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
-rw-r--r--mysql-test/r/mysqld--help.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 5e02b92b98c..d2cbc073a46 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -974,6 +974,8 @@ The following options may be given as the first argument:
replication domains. Note that these threads are in
addition to the IO and SQL threads, which are always
created by a replication slave
+ --slave-parallel-workers=#
+ Alias for slave_parallel_threads
--slave-run-triggers-for-rbr=name
Modes for how triggers in row-base replication on slave
side will be executed. Legal values are NO (default), YES
@@ -1400,6 +1402,7 @@ slave-net-timeout 3600
slave-parallel-max-queued 131072
slave-parallel-mode conservative
slave-parallel-threads 0
+slave-parallel-workers 0
slave-run-triggers-for-rbr NO
slave-skip-errors (No default value)
slave-sql-verify-checksum TRUE