summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <tim@siva.hindu.god>2005-05-27 12:44:06 +1200
committerunknown <tim@siva.hindu.god>2005-05-27 12:44:06 +1200
commit6e6ac213241a7d2b07c3116bcec4faf0e1a73105 (patch)
tree2a70ea125f4439d021ab81f7ad88d90c0897b3ab /scripts
parent8dc53bc32575c4dc010c3c74caada5dfeb96f321 (diff)
downloadmariadb-git-6e6ac213241a7d2b07c3116bcec4faf0e1a73105.tar.gz
scripts/mysqld_safe.sh
Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable. scripts/mysqld_safe.sh: Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable. Without this patch, running mysqld_safe gives: Could not open required defaults file: /opt/home/tim/m/50/m/data/my.cnf Fatal error in defaults handling. Program aborted Could not open required defaults file: /opt/home/tim/m/50/m/data/my.cnf Fatal error in defaults handling. Program aborted These errors are printed by my_print_defaults; mysqld also encounters the same problem and quits.
Diffstat (limited to 'scripts')
-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