Skip to content

Commit 31cad9e

Browse files
committed
Compatibility with MariaDB which uses "extra files" instead of "login paths".
https://mariadb.com/kb/en/mysql_config_editor-compatibility/
1 parent 0b88c34 commit 31cad9e

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

automysqlbackup

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ load_default_config() {
8484
CONFIG_mysql_dump_dbstatus='yes'
8585
CONFIG_mysql_dump_differential='no'
8686
CONFIG_mysql_dump_login_path='automysqldump'
87-
CONFIG_mysql_dump_login_path_file=''
87+
CONFIG_mysql_dump_login_path_file='automysqldump'
88+
CONFIG_mysql_dump_config_extra_file=''
8889
CONFIG_mysql_dump_encrypted_login='no'
8990
CONFIG_backup_local_files=()
9091
CONFIG_db_names=()
@@ -113,11 +114,17 @@ mysql_commands() {
113114
VERSION=`mysql -V | grep -oE "[0-9]+\.[0-9]+\.[0-9]+"`
114115
NODOT_VER=`echo $VERSION | sed $OS_sed_option 's/\.//g'`
115116
if [ "${CONFIG_mysql_dump_encrypted_login}" = "yes" ]; then
116-
export MYSQLDUMP="mysqldump --login-path=$CONFIG_mysql_dump_login_path"
117-
export MYSQLSHOW="mysqlshow --login-path=$CONFIG_mysql_dump_login_path"
118-
export MYSQL="mysql --login-path=$CONFIG_mysql_dump_login_path"
119-
if [ -n "${CONFIG_mysql_dump_login_path_file}" ]; then
120-
export MYSQL_TEST_LOGIN_FILE=$CONFIG_mysql_dump_login_path_file
117+
if [ "${CONFIG_mysql_dump_config_extra_file}" != "" ]; then
118+
export MYSQLDUMP="mysqldump --defaults-extra-file=$CONFIG_mysql_dump_config_extra_file"
119+
export MYSQLSHOW="mysqlshow --defaults-extra-file=$CONFIG_mysql_dump_config_extra_file"
120+
export MYSQL="mysql --defaults-extra-file=$CONFIG_mysql_dump_config_extra_file"
121+
else
122+
export MYSQLDUMP="mysqldump --login-path=$CONFIG_mysql_dump_login_path"
123+
export MYSQLSHOW="mysqlshow --login-path=$CONFIG_mysql_dump_login_path"
124+
export MYSQL="mysql --login-path=$CONFIG_mysql_dump_login_path"
125+
if [ -n "${CONFIG_mysql_dump_login_path_file}" ]; then
126+
export MYSQL_TEST_LOGIN_FILE=$CONFIG_mysql_dump_login_path_file
127+
fi
121128
fi
122129
else
123130
export MYSQLDUMP="mysqldump --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host}";

automysqlbackup.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
# The path to file where "login path" is stored
3131
#CONFIG_mysql_dump_login_path_file=''
3232

33+
# If connecting to a MariaDB server, use the following "extra file" instead of "login path"
34+
# Read more at https://mariadb.com/kb/en/mysql_config_editor-compatibility/
35+
#CONFIG_mysql_dump_config_extra_file='automysqldump'
36+
3337
# Host name (or IP address) of MySQL server e.g localhost
3438
#CONFIG_mysql_dump_host='localhost'
3539

0 commit comments

Comments
 (0)