summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-06-27 18:22:35 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-06-27 18:22:35 -0400
commit7ef5257a64c077742119a7fec9edc105a556eaaa (patch)
treec181b57fb2ab855f831ac983268bdeaa1160a9bf /scripts
parent90f222ea7dea4bebdb3ad93c4c1439e3ab08bbba (diff)
downloadmariadb-git-7ef5257a64c077742119a7fec9edc105a556eaaa.tar.gz
MDEV-10230: --wsrep_on option no longer passed through by mysqld_safe
Append mysqld_safe's wsrep-on option to the list of options used to start mysqld. [Patch contributed by Hartmut]
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 13206ce0e56..07bca1c0318 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -332,14 +332,21 @@ parse_arguments() {
--timezone=*) TZ="$val"; export TZ; ;;
--flush[-_]caches) flush_caches=1 ;;
--numa[-_]interleave) numa_interleave=1 ;;
- --wsrep[-_]on) wsrep_on=1 ;;
- --skip[-_]wsrep[-_]on) wsrep_on=0 ;;
+ --wsrep[-_]on)
+ wsrep_on=1
+ append_arg_to_args "$arg"
+ ;;
+ --skip[-_]wsrep[-_]on)
+ wsrep_on=0
+ append_arg_to_args "$arg"
+ ;;
--wsrep[-_]on=*)
if echo $val | grep -iq '\(ON\|1\)'; then
wsrep_on=1
else
wsrep_on=0
fi
+ append_arg_to_args "$arg"
;;
--wsrep[-_]urls=*) wsrep_urls="$val"; ;;
--wsrep[-_]provider=*)