aboutsummaryrefslogtreecommitdiff
path: root/handlers/mysql
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2006-08-03 17:38:00 +0000
committerMicah Anderson <micah@riseup.net>2006-08-03 17:38:00 +0000
commit32e13d4c6573fecca4964b1a9f77254823d2e589 (patch)
tree888fc3b1c244e03ae150b547c7b638d94a4aea74 /handlers/mysql
parenteaddb268492a59cdf5408b97d9340b2a777b1142 (diff)
downloadbackupninja-32e13d4c6573fecca4964b1a9f77254823d2e589.tar.gz
backupninja-32e13d4c6573fecca4964b1a9f77254823d2e589.tar.bz2
Added fix to mysql handler for option change to --extra-files, also
comitting change to pgsql handler that I forgot to change, allows the postgresql user to be set in backupninja.conf, instead of hardcoded
Diffstat (limited to 'handlers/mysql')
-rw-r--r--handlers/mysql10
1 files changed, 5 insertions, 5 deletions
diff --git a/handlers/mysql b/handlers/mysql
index a19509b..02289f1 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -75,7 +75,7 @@ fi
# 1. setting the user, so that /home/user/.my.cnf is used.
# 2. specifying the user and password in the handler config,
# which generates a temporary .my.cnf in /root/.my.cnf
-# 3. specify the config file with --defaults-file
+# 3. specify the config file with --defaults-extra-file
# (this option DOESN'T WORK WITH MYSQLHOTCOPY)
#
@@ -130,16 +130,16 @@ EOF
umask $oldmask
if [ $usevserver = yes ]
then
- defaultsfile="--defaults-file=$vhome/.my.cnf"
+ defaultsfile="--defaults-extra-file=$vhome/.my.cnf"
else
- defaultsfile="--defaults-file=$mycnf"
+ defaultsfile="--defaults-extra-file=$mycnf"
fi
fi
# if a user is not set, use $configfile, otherwise use $mycnf
if [ "$user" == "" ]; then
user=root;
- defaultsfile="--defaults-file=$configfile"
+ defaultsfile="--defaults-extra-file=$configfile"
else
userset=true;
if [ $usevserver = yes ]
@@ -160,7 +160,7 @@ else
debug "User home set to: $userhome"
[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
- defaultsfile="--defaults-file=$userhome/.my.cnf"
+ defaultsfile="--defaults-extra-file=$userhome/.my.cnf"
debug "using $defaultsfile"
fi