X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=a19509bf062545b0192b42db6974d49fa9a5d060;hb=b5130c49410c6c1300b9c8f6246a61c4d1e66004;hp=1bf4edb48ca75e103d6862145914f6f56b71f468;hpb=e9e56a7af88cb07d453a94af1133bf0665f00ae3;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/mysql b/handlers/mysql
index 1bf4edb..a19509b 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -179,10 +179,10 @@ then
 	else
 		execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
 	fi
-	debug 'su $user -c \"$execstr\"'
+	debug "su $user -c \"$execstr\""
 	if [ ! $test ]
 	then
-		output=`su $user -c \"$execstr\" 2>&1`
+		output=`su $user -c "$execstr" 2>&1`
 		code=$?
 		if [ "$code" == "0" ]
 		then
@@ -205,7 +205,7 @@ then
 		debug 'su $user -c \"$execstr\"'
 		if [ ! $test ]
 		then
-			output=`su $user -c \"$execstr\" 2>&1`
+			output=`su $user -c "$execstr" 2>&1`
 			code=$?
 			if [ "$code" == "0" ]
 			then
@@ -231,13 +231,13 @@ 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`
+	    databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
 	    if [ $? -ne 0 ]
 	    then
 	        fatal "Authentication problem, maybe user/password is wrong"
 	    fi
 	else
-		databases=`echo 'show databases' | su $user -c \"$MYSQL $defaultsfile\" | grep -v Database`
+		databases=`echo 'show databases' | su $user -c "$MYSQL $defaultsfile" | grep -v Database`
 		if [ $? -ne 0 ]
 		then
 		    fatal "Authentication problem, maybe user/password is wrong"
@@ -249,14 +249,22 @@ fi
 	do
 		if [ $usevserver = yes ]
 		then
-			execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $vroot$dumpdir/${db}.sql"
+                   if [ "$compress" == "yes" ]; then
+                      execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db | $GZIP > $vroot$dumpdir/${db}.sql.gz"
+                   else
+                      execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $vroot$dumpdir/${db}.sql"
+                   fi
 		else
-			execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
+                   if [ "$compress" == "yes" ]; then
+                      execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db | $GZIP > $dumpdir/${db}.sql.gz"
+                   else
+                      execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
+                   fi
 		fi
-		debug 'su $user -c \"$execstr\"'
+		debug "su $user -c \"$execstr\""
 		if [ ! $test ]
 		then
-			output=`su $user -c \"$execstr\" 2>&1`
+			output=`su $user -c "$execstr" 2>&1`
 			code=$?
 			if [ "$code" == "0" ]
 			then
@@ -268,13 +276,6 @@ fi
 			fi
 		fi
 	done
-	
-	if [ "$compress" == "yes" ]
-	then
-		output=`$GZIP -f $vroot$dumpdir/*.sql 2>&1`
-		debug $output
-	fi
-fi
 
 # clean up tmp config file
 if [ "$dbusername" != "" -a "$dbpassword" != "" ]