projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backupninja.in: improved VROOTDIR detection as in lib/vserver.in
[matthijs/upstream/backupninja.git]
/
handlers
/
mysql
diff --git
a/handlers/mysql
b/handlers/mysql
index 7ca9ab64ecbc2dc6a17839ecad79e5cfa21a5279..d3179309412bde11ca83bd85dd12165ac0c1bbed 100644
(file)
--- a/
handlers/mysql
+++ b/
handlers/mysql
@@
-139,15
+139,12
@@
EOF
else
defaultsfile="--defaults-file=$mycnf"
fi
else
defaultsfile="--defaults-file=$mycnf"
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
userset=true;
if [ $usevserver ]
else
userset=true;
if [ $usevserver ]
@@
-238,6
+235,7
@@
then
then
if [ $usevserver ]
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
databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
if [ $? -ne 0 ]
then