diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-06-01 07:13:01 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-06-01 07:13:01 +0200 |
| commit | 43e577c42684c8eabc5d5bfda6113819c877d262 (patch) | |
| tree | 79da197df46bb0782db8b3a5c336d1fcb9bc01bf /scripts | |
| parent | 23f261ef04ce2ee09adb17376507b17c1e9b3a88 (diff) | |
| parent | 8d5edfdaa47c94eef3b09350ebdb08bf0cf2eba2 (diff) | |
| download | mariadb-git-43e577c42684c8eabc5d5bfda6113819c877d262.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 |
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 |