mysql: Properly set the path to .my.conf when vservers are used.

This fixes the case when the user option and the vsname option are both
used.

diff --git a/handlers/mysql.in b/handlers/mysql.in
index d22ef26c99d4cd926bffd3c7f32297664f08702f..3a908f68ef669b62e6c0cb3d63eeb230a5b86199 100644 (file)
--- a/handlers/mysql.in
+++ b/handlers/mysql.in
@@ -161,7 +161,11 @@ else
        
        debug "User home set to: $userhome"
        [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
-       defaultsfile="--defaults-extra-file=$userhome/.my.cnf"
+        if [ $usevserver = yes ]; then
+            defaultsfile="--defaults-extra-file=$vuserhome/.my.cnf"
+        else
+            defaultsfile="--defaults-extra-file=$userhome/.my.cnf"
+        fi
        debug "using $defaultsfile"
 fi