summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2001-02-17 19:04:33 +0200
committermonty@donna.mysql.com <>2001-02-17 19:04:33 +0200
commitece13efde985355d0eb1df8875eabe3fd75cf007 (patch)
treea90993e8e601e10bc825a635e85bda9a1d5ee5bd /scripts
parent6fd7fb49cb34e296884f4b5b7aa5f0efdf87e109 (diff)
downloadmariadb-git-ece13efde985355d0eb1df8875eabe3fd75cf007.tar.gz
Write UNION() for MERGE tables
Diffstat (limited to 'scripts')
-rw-r--r--scripts/safe_mysqld.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh
index 7120587f1de..6d215ec3d16 100644
--- a/scripts/safe_mysqld.sh
+++ b/scripts/safe_mysqld.sh
@@ -72,6 +72,10 @@ 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"
+ then
+ defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+ fi
# Check if this is a 'moved install directory'
elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
-x ./libexec/mysqld