X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql.in;fp=handlers%2Fmysql.in;h=7ff194e924b1f6bf655d638efc24dc94bd948764;hb=ceb5689d506197ffb2269c6c64a8ea0802d55aba;hp=39c1fb9c2729819b5d80f86873d910f0f808917c;hpb=cde6d7f672aa62f5e6f42be343b0299f2e3d4cbf;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

diff --git a/handlers/mysql.in b/handlers/mysql.in
index 39c1fb9..7ff194e 100644
--- a/handlers/mysql.in
+++ b/handlers/mysql.in
@@ -235,8 +235,8 @@ then
     then
 	if [ $usevserver = yes ]
 	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`
+	    debug "$VSERVER $vsname exec su $user -c \"$MYSQL $defaultsfile -N -B -e 'show databases'\" | sed 's/|//g;/\+----/d'"
+	    databases=`$VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile -N -B -e 'show databases'" | sed 's/|//g;/\+----/d'`
 	    if [ $? -ne 0 ]
 	    then
 	        fatal "Authentication problem, maybe user/password is wrong or mysqld is not running?"