diff options
| author | Alexey Yurchenko <alexey.yurchenko@galeracluster.com> | 2021-03-15 14:35:08 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2021-03-29 22:05:46 +0200 |
| commit | 4d870b591dc6b96c38687c6e732423b49ad8765b (patch) | |
| tree | 4b5fab8f4e7d59558b6ee3f0890df5a1690f1b05 | |
| parent | 94dea8ef5b9805fe368972c812183ec365084b87 (diff) | |
| download | mariadb-git-4d870b591dc6b96c38687c6e732423b49ad8765b.tar.gz | |
Don't pass password to innobackup via command line, use environment insteadbb-10.2-codership-cmd-line-pswd
Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
| -rw-r--r-- | scripts/wsrep_sst_mariabackup.sh | 6 | ||||
| -rw-r--r-- | scripts/wsrep_sst_xtrabackup-v2.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh index 231cf6e3702..4354e341ca5 100644 --- a/scripts/wsrep_sst_mariabackup.sh +++ b/scripts/wsrep_sst_mariabackup.sh @@ -868,10 +868,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 get_keys diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh index 8fbbeda170c..8c8af9a0219 100644 --- a/scripts/wsrep_sst_xtrabackup-v2.sh +++ b/scripts/wsrep_sst_xtrabackup-v2.sh @@ -958,10 +958,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 get_keys |