aboutsummaryrefslogtreecommitdiff
path: root/handlers/mysql
diff options
context:
space:
mode:
Diffstat (limited to 'handlers/mysql')
-rw-r--r--handlers/mysql8
1 files changed, 3 insertions, 5 deletions
diff --git a/handlers/mysql b/handlers/mysql
index 7ca9ab6..d317930 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -139,15 +139,12 @@ EOF
else
defaultsfile="--defaults-file=$mycnf"
fi
-
-# if user is set, don't use $mycnf
-elif [ "$userset" == "false" ]; then
- defaultsfile="--defaults-file=$configfile"
fi
+# if a user is not set, use $confgfile, otherwise use $mycnf
if [ "$user" == "" ]; then
- userset=false;
user=root;
+ defaultsfile="--defaults-file=$configfile"
else
userset=true;
if [ $usevserver ]
@@ -238,6 +235,7 @@ then
then
if [ $usevserver ]
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`
if [ $? -ne 0 ]
then