diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-31 09:47:14 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-31 09:47:14 +0300 |
| commit | 50de71b026ddb560db2be14a06897874a5732dac (patch) | |
| tree | 576632c133864dca617a3e9f9855937c1ecae897 /scripts/wsrep_sst_mariabackup.sh | |
| parent | 7ae37ff74fc18c391bd0d3fd1fbf6afafe966435 (diff) | |
| parent | d6d3d9ae2ffb1df8eebfe0c922394bbc7b12e4ed (diff) | |
| download | mariadb-git-50de71b026ddb560db2be14a06897874a5732dac.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'scripts/wsrep_sst_mariabackup.sh')
| -rw-r--r-- | scripts/wsrep_sst_mariabackup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh index 181cd45cf44..bbd1bafbd41 100644 --- a/scripts/wsrep_sst_mariabackup.sh +++ b/scripts/wsrep_sst_mariabackup.sh @@ -864,10 +864,10 @@ then fi if [ -n "${WSREP_SST_OPT_PSWD:-}" ]; then - INNOEXTRA+=" --password=$WSREP_SST_OPT_PSWD" + export MYSQL_PWD=$WSREP_SST_OPT_PSWD elif [[ $usrst -eq 1 ]];then - # Empty password, used for testing, debugging etc. - INNOEXTRA+=" --password=" + # Empty password, used for testing, debugging etc. + unset MYSQL_PWD fi check_extra |