diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2022-02-19 01:50:11 +0100 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2022-02-19 01:50:11 +0100 |
| commit | c272f7ca6bdc7af6c2c85c6346433482dc8c195f (patch) | |
| tree | 10a4e83d4bd3a6b8d87528b0765f2e97345d7d72 | |
| parent | e4249fb47717352c37c7b7fc3428ef4b9cbbb242 (diff) | |
| download | mariadb-git-bb-10.2-MDEV-26377-final.tar.gz | |
Experimentalbb-10.2-MDEV-26377-final
| -rw-r--r-- | scripts/wsrep_sst_common.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh index ddb68988c91..d4d9a58897d 100644 --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@ -467,25 +467,25 @@ case "$1" in ;; '--innodb-force-recovery') if [ -n "$value" -a "$value" != "0" ]; then - INNODB_FORCE_RECOVERY="$value" + INNODB_FORCE_RECOVERY=$(trim_string "$value") fi skip_mysqld_arg=1 ;; '--log-bin') if [ -z "$WSREP_SST_OPT_BINLOG" ]; then - MYSQLD_OPT_LOG_BIN="$value" + MYSQLD_OPT_LOG_BIN=$(trim_string "$value") fi skip_mysqld_arg=1 ;; '--log-bin-index') if [ -z "$WSREP_SST_OPT_BINLOG_INDEX" ]; then - MYSQLD_OPT_LOG_BIN_INDEX="$value" + MYSQLD_OPT_LOG_BIN_INDEX=$(trim_string "$value") fi skip_mysqld_arg=1 ;; '--log-basename') if [ -z "$WSREP_SST_OPT_LOG_BASENAME" ]; then - MYSQLD_OPT_LOG_BASENAME="$value" + MYSQLD_OPT_LOG_BASENAME=$(trim_string "$value") fi skip_mysqld_arg=1 ;; @@ -823,6 +823,9 @@ parse_cnf() # Use default if we haven't found a value: [ -z "$reval" ] && reval="${3:-}" + # Truncate spaces: + [ -n "$reval" ] && reval=$(trim_string "$reval") + if [ -n "$BASH_VERSION" ]; then printf '%s' "$reval" else @@ -1443,13 +1446,9 @@ check_server_ssl_config() fi fi if [ -n "$tcert" ]; then - tcert=$(trim_string "$tcert") if [ "${tcert%/}" != "$tcert" -o -d "$tcert" ]; then tcap="$tcert" tcert="" fi fi - if [ -n "$tcap" ]; then - tcap=$(trim_string "$tcap") - fi } |