diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 16:33:57 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 16:33:57 -0400 |
| commit | 90ead99572c8168583cb0943792d964cc2a6abd2 (patch) | |
| tree | 715afd1c1bccbca66eee3c3b58f8e6589f53fe37 /scripts | |
| parent | b441c510a7ea731e2da0fa9b4cf3e7f1275f841b (diff) | |
| download | mariadb-git-90ead99572c8168583cb0943792d964cc2a6abd2.tar.gz | |
bzr merge -r3980..3984 codership/5.5
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_common.sh | 10 | ||||
| -rw-r--r-- | scripts/wsrep_sst_mysqldump.sh | 13 |
2 files changed, 14 insertions, 9 deletions
diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh index f9a08c1c695..b6c10ba4e7d 100644 --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@ -20,6 +20,7 @@ set -u WSREP_SST_OPT_BYPASS=0 WSREP_SST_OPT_DATA="" +WSREP_SST_OPT_AUTH="" while [ $# -gt 0 ]; do case "$1" in @@ -55,7 +56,7 @@ case "$1" in shift ;; '--password') - readonly WSREP_SST_OPT_PSWD="$2" + WSREP_SST_OPT_PSWD="$2" shift ;; '--port') @@ -71,7 +72,7 @@ case "$1" in shift ;; '--user') - readonly WSREP_SST_OPT_USER="$2" + WSREP_SST_OPT_USER="$2" shift ;; '--gtid') @@ -88,8 +89,8 @@ done readonly WSREP_SST_OPT_BYPASS # For Bug:1200727 -if my_print_defaults -c $WSREP_SST_OPT_CONF sst | grep -q "wsrep_sst_auth";then - if [ -z $WSREP_SST_OPT_AUTH -o $WSREP_SST_OPT_AUTH = "(null)" ];then +if my_print_defaults -c $WSREP_SST_OPT_CONF sst | grep -q "wsrep_sst_auth";then + if [ -z "$WSREP_SST_OPT_AUTH" -o "$WSREP_SST_OPT_AUTH" = "(null)" ];then WSREP_SST_OPT_AUTH=$(my_print_defaults -c $WSREP_SST_OPT_CONF sst | grep -- "--wsrep_sst_auth" | cut -d= -f2) fi fi @@ -124,4 +125,3 @@ wsrep_cleanup_progress_file() { [ -n "$SST_PROGRESS_FILE" ] && rm -f "$SST_PROGRESS_FILE" 2>/dev/null } - diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh index cf4f55df98e..3db1d73bb9c 100644 --- a/scripts/wsrep_sst_mysqldump.sh +++ b/scripts/wsrep_sst_mysqldump.sh @@ -1,15 +1,15 @@ -#!/bin/sh -e +#!/bin/bash -e # Copyright (C) 2009 Codership Oy -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston @@ -61,6 +61,11 @@ then exit $EINVAL fi +# For Bug:1293798 +if [ -z "$WSREP_SST_OPT_PSWD" -a -n "$WSREP_SST_OPT_AUTH" ]; then + WSREP_SST_OPT_USER=$(echo $WSREP_SST_OPT_AUTH | cut -d: -f1) + WSREP_SST_OPT_PSWD=$(echo $WSREP_SST_OPT_AUTH | cut -d: -f2) +fi AUTH="-u$WSREP_SST_OPT_USER" if test -n "$WSREP_SST_OPT_PSWD"; then AUTH="$AUTH -p$WSREP_SST_OPT_PSWD"; fi |