summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormonty@donna.mysql.fi <>2001-04-17 14:02:28 +0300
committermonty@donna.mysql.fi <>2001-04-17 14:02:28 +0300
commit4edafca6a3fc8bcbe8d84d2365124b02fa343378 (patch)
tree2feb7d4406cc5558be41ea402576222b0ff9e4fc /scripts
parent1e80c3f3e13b10d607150caad5af3a0a8b279ce5 (diff)
downloadmariadb-git-4edafca6a3fc8bcbe8d84d2365124b02fa343378.tar.gz
Fixed that -ldl is not used for clients
Fixed rpl000001 to handle the most common mysql-test-run ports.
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