projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forgot to update Changelog for previous rev: rdiff now works if testconnect=no and...
[matthijs/upstream/backupninja.git]
/
handlers
/
mysql
diff --git
a/handlers/mysql
b/handlers/mysql
index 1bf4edb48ca75e103d6862145914f6f56b71f468..52193f4ec0afa8642dd0daaf7ddc299315952f1f 100644
(file)
--- a/
handlers/mysql
+++ b/
handlers/mysql
@@
-179,10
+179,10
@@
then
else
execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
fi
else
execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
fi
- debug
'su $user -c \"$execstr\"'
+ debug
"su $user -c \"$execstr\""
if [ ! $test ]
then
if [ ! $test ]
then
- output=`su $user -c
\"$execstr\
" 2>&1`
+ output=`su $user -c
"$execstr
" 2>&1`
code=$?
if [ "$code" == "0" ]
then
code=$?
if [ "$code" == "0" ]
then
@@
-205,7
+205,7
@@
then
debug 'su $user -c \"$execstr\"'
if [ ! $test ]
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
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'
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
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"
if [ $? -ne 0 ]
then
fatal "Authentication problem, maybe user/password is wrong"
@@
-253,10
+253,10
@@
fi
else
execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
fi
else
execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
fi
- debug
'su $user -c \"$execstr\"'
+ debug
"su $user -c \"$execstr\""
if [ ! $test ]
then
if [ ! $test ]
then
- output=`su $user -c
\"$execstr\
" 2>&1`
+ output=`su $user -c
"$execstr
" 2>&1`
code=$?
if [ "$code" == "0" ]
then
code=$?
if [ "$code" == "0" ]
then