Merge

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