diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-13 10:26:01 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-13 10:26:01 +0300 |
| commit | 6e6318b29b446f76f01f2ef65d1460870b607d2a (patch) | |
| tree | 8c22bb7661b77c91b28532ddd7c150d4bf010146 /extra/mariabackup/backup_mysql.cc | |
| parent | 450c017c2d9e490d92c949d5164b4a99b6b3f5db (diff) | |
| parent | e262eb165c197083df9f4986ab54c5b2dcbd6290 (diff) | |
| download | mariadb-git-6e6318b29b446f76f01f2ef65d1460870b607d2a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'extra/mariabackup/backup_mysql.cc')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index b3c2834d7aa..5a2b2625c26 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -44,6 +44,7 @@ Street, Fifth Floor, Boston, MA 02110-1335 USA #include <mysql.h> #include <mysqld.h> #include <my_sys.h> +#include <stdlib.h> #include <string.h> #include <limits> #include "common.h" @@ -108,6 +109,13 @@ xb_mysql_connect() return(NULL); } +#if !defined(DONT_USE_MYSQL_PWD) + if (!opt_password) + { + opt_password=getenv("MYSQL_PWD"); + } +#endif + if (!opt_secure_auth) { mysql_options(connection, MYSQL_SECURE_AUTH, (char *) &opt_secure_auth); |