diff options
author | Alexey Yurchenko <ayurchen@gmail.com> | 2015-06-06 01:08:41 +0300 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-09 22:29:03 -0400 |
commit | 86ee30cea95b4a3c8b34398e75e4fc62d0501616 (patch) | |
tree | 62b43cc16417537c889584356b48ae50030ba46a /sql/wsrep_utils.cc | |
parent | 197e9d2559907b97905f7d1536b481bba2e9ffe3 (diff) | |
download | mariadb-git-86ee30cea95b4a3c8b34398e75e4fc62d0501616.tar.gz |
Refs codership/mysql-wsrep#141: this commit
1. Passes wsrep_sst_auth_value to SST scripts via WSREP_SST_OPT_AUTH envronmental variable, so it never appears on the command line
2. In mysqldump and xtrabackup* SST scripts which rely on MySQL authentication, instead of passing password on the command line, SST script sets MYSQL_PWD environment variable, so that password also never appears on the mysqldump/innobackupex command line.
Diffstat (limited to 'sql/wsrep_utils.cc')
-rw-r--r-- | sql/wsrep_utils.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc index 719e8e6b473..b6b50ae7443 100644 --- a/sql/wsrep_utils.cc +++ b/sql/wsrep_utils.cc @@ -165,9 +165,10 @@ env::append(const char* val) ++len_; env_[len_] = NULL; } - else errno_ = errno; } - else errno_ = errno; + + /* if either realloc() or strdup() failed, errno had been set */ + errno_ = errno; return errno_; } |