Added RPM patches submitted by Robert Napier

[matthijs/upstream/backupninja.git] / handlers / mysql

diff --git a/handlers/mysql b/handlers/mysql
index f89d8d724bccd00d6a401f0cd408cb740ab2f8c9..cd72fc9087bb7033e009f0c8125c0e75ef80b9a4 100644 (file)
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -75,7 +75,7 @@ fi
 # 1. setting the user, so that /home/user/.my.cnf is used.
 # 2. specifying the user and password in the handler config,
 #    which generates a temporary .my.cnf in /root/.my.cnf
-# 3. specify the config file with --defaults-file
+# 3. specify the config file with --defaults-extra-file
 #    (this option DOESN'T WORK WITH MYSQLHOTCOPY)
 #
 
@@ -130,16 +130,16 @@ EOF
        umask $oldmask
        if [ $usevserver = yes ] 
        then
-           defaultsfile="--defaults-file=$vhome/.my.cnf"
+           defaultsfile="--defaults-extra-file=$vhome/.my.cnf"
        else
-           defaultsfile="--defaults-file=$mycnf"
+           defaultsfile="--defaults-extra-file=$mycnf"
        fi
 fi
 
 # if a user is not set, use $configfile, otherwise use $mycnf
 if [ "$user" == "" ]; then
        user=root;
-       defaultsfile="--defaults-file=$configfile"
+       defaultsfile="--defaults-extra-file=$configfile"
 else
        userset=true;
        if [ $usevserver = yes ]
@@ -160,7 +160,7 @@ else
        
        debug "User home set to: $userhome"
        [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
-       defaultsfile="--defaults-file=$userhome/.my.cnf"
+       defaultsfile="--defaults-extra-file=$userhome/.my.cnf"
        debug "using $defaultsfile"
 fi
 
@@ -179,7 +179,7 @@ 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`
@@ -202,7 +202,7 @@ then
                else
                        execstr="$MYSQLHOTCOPY --allowold $db $hotdir"
                fi
-               debug "su $user -c '$execstr'"
+               debug 'su $user -c \"$execstr\"'
                if [ ! $test ]
                then
                        output=`su $user -c "$execstr" 2>&1`
@@ -230,7 +230,7 @@ then
     then
        if [ $usevserver = yes ]
        then
-           debug "echo show databases | $VSERVER $vsname exec su $user -c $MYSQL $defaultsfile | grep -v Database"
+           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
@@ -249,11 +249,19 @@ 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`
@@ -268,16 +276,10 @@ 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" != "" ]
+if [ "$dbusername" != "" -a "$dbpassword" != "" ]
 then
        ## clean up tmp config file
        debug "rm $mycnf"