projects
/
matthijs
/
upstream
/
backupninja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2ee26ab
)
Fixed mysql no user defaults file handling
author
Micah Anderson
<micah@riseup.net>
Tue, 3 Jan 2006 16:09:29 +0000
(16:09 +0000)
committer
Micah Anderson
<micah@riseup.net>
Tue, 3 Jan 2006 16:09:29 +0000
(16:09 +0000)
ChangeLog
patch
|
blob
|
history
handlers/mysql
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 4df4f4a04f798563a821ced2ab752b23b16c62e8..5b0bb6afe675e3144fd5c544c3f34e67b77f4996 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-4,6
+4,9
@@
version 0.9.3 -- unreleased
. added (commented out) the various default paths to
programs such as PGSQLDUMP, so that users can figure
out more easily they can customize them
. added (commented out) the various default paths to
programs such as PGSQLDUMP, so that users can figure
out more easily they can customize them
+ handler changes
+ mysql:
+ . fixed no user defaults file processing
version 0.9.2 -- December 29, 2005
backupninja changes
version 0.9.2 -- December 29, 2005
backupninja changes
diff --git
a/handlers/mysql
b/handlers/mysql
index 7ca9ab64ecbc2dc6a17839ecad79e5cfa21a5279..d3179309412bde11ca83bd85dd12165ac0c1bbed 100644
(file)
--- a/
handlers/mysql
+++ b/
handlers/mysql
@@
-139,15
+139,12
@@
EOF
else
defaultsfile="--defaults-file=$mycnf"
fi
else
defaultsfile="--defaults-file=$mycnf"
fi
-
-# if user is set, don't use $mycnf
-elif [ "$userset" == "false" ]; then
- defaultsfile="--defaults-file=$configfile"
fi
fi
+# if a user is not set, use $confgfile, otherwise use $mycnf
if [ "$user" == "" ]; then
if [ "$user" == "" ]; then
- userset=false;
user=root;
user=root;
+ defaultsfile="--defaults-file=$configfile"
else
userset=true;
if [ $usevserver ]
else
userset=true;
if [ $usevserver ]
@@
-238,6
+235,7
@@
then
then
if [ $usevserver ]
then
then
if [ $usevserver ]
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`
if [ $? -ne 0 ]
then
databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
if [ $? -ne 0 ]
then