summaryrefslogtreecommitdiff
path: root/mysql-test/install_test_db.sh
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/install_test_db.sh')
-rw-r--r--mysql-test/install_test_db.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh
index c87cf82088f..3b361b8afec 100644
--- a/mysql-test/install_test_db.sh
+++ b/mysql-test/install_test_db.sh
@@ -5,9 +5,16 @@
# This scripts creates the privilege tables db, host, user, tables_priv,
# columns_priv in the mysql database, as well as the func table.
-if [ x$1 = x"-bin" ]; then
+if [ x$1 = x"--bin" ]; then
shift 1
- execdir=../bin
+
+# Check if it's a binary distribution or a 'make install'
+if test -x ../libexec/mysqld
+ then
+ execdir=../libexec
+ else
+ execdir=../bin
+fi
bindir=../bin
BINARY_DIST=1
fix_bin=mysql-test