summaryrefslogtreecommitdiff
path: root/scripts/mysqld_safe.sh
diff options
context:
space:
mode:
authortim@siva.hindu.god <>2005-05-27 12:44:06 +1200
committertim@siva.hindu.god <>2005-05-27 12:44:06 +1200
commit8a77c6f7417771efc826bd0595ca414ead94d582 (patch)
tree2a70ea125f4439d021ab81f7ad88d90c0897b3ab /scripts/mysqld_safe.sh
parentf8cb00640f06230f0d8f200a04ccd91d02bb8bd3 (diff)
downloadmariadb-git-8a77c6f7417771efc826bd0595ca414ead94d582.tar.gz
scripts/mysqld_safe.sh
Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable.
Diffstat (limited to 'scripts/mysqld_safe.sh')
-rw-r--r--scripts/mysqld_safe.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 9ec573737bd..3a06c4d1fb5 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -114,7 +114,7 @@ then
MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
DATADIR=$MY_BASEDIR_VERSION/data
- if test -z "$defaults"
+ if test -z "$defaults" -a -r "$DATADIR/my.cnf"
then
defaults="--defaults-extra-file=$DATADIR/my.cnf"
fi