diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 11:35:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 11:35:39 +0300 |
| commit | 6c3e860cbf36831c118f6ea183acbbeb3c889bed (patch) | |
| tree | 8585545cc8a95e790c01eb164f74685674f9f23b /extra/mariabackup/backup_mysql.cc | |
| parent | 9ff737b25edbcb0c74d9d312f6da702e7d993e88 (diff) | |
| parent | 5008171b05e0d3b8b5f4af312b94a312281e77c7 (diff) | |
| download | mariadb-git-6c3e860cbf36831c118f6ea183acbbeb3c889bed.tar.gz | |
Merge 10.4 into 10.5
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 28aed958c73..95688933324 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" @@ -107,6 +108,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); |