mysql: pass options consistently when listing databases.

r495 improved the database listing command, but only did this for the
non-vserver case. This corrects that.

diff --git a/handlers/mysql.in b/handlers/mysql.in
index 39c1fb9c2729819b5d80f86873d910f0f808917c..7ff194e924b1f6bf655d638efc24dc94bd948764 100644 (file)
--- 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?"