Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-09-19 15:11:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix code logic to make dbusername/dbpassword actually usable (Closes Redmine bug #2264)

Browse Source
This commit is contained in:
intrigeri 2010-06-24 16:53:58 +02:00
parent 9179c59b50
commit 4015578106
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -34,3 +34,4 @@ Olivier Berger <oberger@ouvaton.org> -- much work on the dup handler
stefan <s.freudenberg@jpberlin.de> -- dup support for Amazon S3 buckets
maniacmartin <martin@maniacmartin.com> -- rdiff confusing error message fix
Chris Nolan <chris@cenolan.com> -- maildir subdirectory expansion
Dan Carley -- mysql bugfix

2
ChangeLog
View File

@ -25,6 +25,8 @@ version 0.9.8 -- UNRELEASED
mysql:
. Don't lock tables in the information_schema database
(Closes: #587011)
. Fix code logic to make dbusername/dbpassword actually usable
(Closes Redmine bug #2264)
doc changes
manpage:
. Fix typo in manpage (Closes: #583778)

15
handlers/mysql.in
View File

@ -86,7 +86,7 @@ fi
defaultsfile=""
if [ "$dbusername" != "" -a "$dbpassword" != "" ]
if [ -n "$dbusername" -a -n "$dbpassword" ]
then
if [ $usevserver = yes ]
then
@ -140,13 +140,10 @@ password="$dbpassword"
EOF
umask $oldmask
defaultsfile="--defaults-extra-file=$mycnf"
fi
# if a user is not set, use $configfile, otherwise use $mycnf
if [ "$user" == "" ]; then
user=root;
defaultsfile="--defaults-extra-file=$configfile"
else
# else, if a user is set use her .my.cnf
elif [ -n "$user" ]
then
userset=true;
if [ $usevserver = yes ]
then
@ -169,6 +166,10 @@ else
defaultsfile="--defaults-extra-file=$userhome/.my.cnf"
debug "using $defaultsfile"
# otherwise use $configfile
else
user=root
defaultsfile="--defaults-extra-file=$configfile"
fi
#######################################################################