diff options
| author | unknown <jimw@mysql.com> | 2005-01-06 21:39:57 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-06 21:39:57 +0100 |
| commit | ae7cfe9ee8507d2d145c806cc07b39a712426331 (patch) | |
| tree | 867359a78f2803835d16c17deb9b799cf55ed674 /scripts/mysqld_safe.sh | |
| parent | 7826587dbedf00f0ba758969afd04c67fdf7deaf (diff) | |
| parent | e50bfebe994482b81b2123367e6bdd79f67e5906 (diff) | |
| download | mariadb-git-ae7cfe9ee8507d2d145c806cc07b39a712426331.tar.gz | |
Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0
client/mysqladmin.cc:
Auto merged
client/mysqldump.c:
Auto merged
include/my_pthread.h:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -rw-r--r-- | scripts/mysqld_safe.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 0b83acfa13d..d6ee11f226d 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -82,7 +82,7 @@ parse_arguments() { MY_PWD=`pwd` # Check if we are starting this relative (for the binary release) -if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ +if test -f ./share/mysql/english/errmsg.sys -a \ -x ./bin/mysqld then MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are @@ -93,7 +93,7 @@ then defaults="--defaults-extra-file=$DATADIR/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 \ +elif test -f ./share/mysql/english/errmsg.sys -a \ -x ./libexec/mysqld then MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are |