Skip to content
Snippets Groups Projects
Commit ee384b08 authored by micah's avatar micah :speech_balloon:
Browse files

Fixed mysql no user defaults file handling

parent 2ee26aba
Branches
Tags
No related merge requests found
...@@ -4,6 +4,9 @@ version 0.9.3 -- unreleased ...@@ -4,6 +4,9 @@ version 0.9.3 -- unreleased
. added (commented out) the various default paths to . added (commented out) the various default paths to
programs such as PGSQLDUMP, so that users can figure programs such as PGSQLDUMP, so that users can figure
out more easily they can customize them out more easily they can customize them
handler changes
mysql:
. fixed no user defaults file processing
version 0.9.2 -- December 29, 2005 version 0.9.2 -- December 29, 2005
backupninja changes backupninja changes
......
...@@ -139,15 +139,12 @@ EOF ...@@ -139,15 +139,12 @@ EOF
else else
defaultsfile="--defaults-file=$mycnf" defaultsfile="--defaults-file=$mycnf"
fi fi
# if user is set, don't use $mycnf
elif [ "$userset" == "false" ]; then
defaultsfile="--defaults-file=$configfile"
fi fi
# if a user is not set, use $confgfile, otherwise use $mycnf
if [ "$user" == "" ]; then if [ "$user" == "" ]; then
userset=false;
user=root; user=root;
defaultsfile="--defaults-file=$configfile"
else else
userset=true; userset=true;
if [ $usevserver ] if [ $usevserver ]
...@@ -238,6 +235,7 @@ then ...@@ -238,6 +235,7 @@ then
then then
if [ $usevserver ] if [ $usevserver ]
then then
debug "echo show databases | $VSERVER $vsname exec su $user -c $MYSQL $defaultsfile | grep -v Database"
databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database` databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment