From 7ef5257a64c077742119a7fec9edc105a556eaaa Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@mariadb.com>
Date: Mon, 27 Jun 2016 18:22:35 -0400
Subject: [PATCH] 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]
---
 scripts/mysqld_safe.sh | 11 +++++++++--
 1 file 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=*)