summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_install_db.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index aec9286fd9e..ee126a87b56 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -79,14 +79,17 @@ then
basedir=@prefix@
bindir=@bindir@
execdir=@libexecdir@
-elif test -d "$basedir/libexec"
-then
+else
bindir="$basedir/bin"
+if test -x "$basedir/libexec/mysqld"
+then
execdir="$basedir/libexec"
+elif test -x "@libexecdir@/mysqld"
+ execdir="@libexecdir@"
else
- bindir="$basedir/bin"
execdir="$basedir/bin"
fi
+fi
mdata=$ldata/mysql