diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-17 19:04:33 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-17 19:04:33 +0200 |
| commit | 456102115c2f70982e600e40e34a10afde72c703 (patch) | |
| tree | a90993e8e601e10bc825a635e85bda9a1d5ee5bd /scripts | |
| parent | d83e79ce76d77cfdf2b5589e053df988b90f17d7 (diff) | |
| download | mariadb-git-456102115c2f70982e600e40e34a10afde72c703.tar.gz | |
Write UNION() for MERGE tables
Docs/manual.texi:
Clearify when logging is done
myisam/myisamchk.c:
Better error message
mysql-test/r/merge.result:
Added test for SHOW CREATE on MERGE table
scripts/safe_mysqld.sh:
Search by default in database directory
sql/ha_myisammrg.h:
Add UNION() to SHOW CREATE TABLE
sql/sql_update.cc:
removed compiler warning
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/safe_mysqld.sh | 4 |
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 |