diff options
| author | monty@mysql.com <> | 2004-03-16 22:41:30 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-03-16 22:41:30 +0200 |
| commit | 350b4335696fc88efa2bbf2139d2f8bf9aa5701c (patch) | |
| tree | af285d8080c003d1ecb1479ec43c9b6996fd567f /mysql-test/install_test_db.sh | |
| parent | 861bf3c8c031ea80076acb7f7466bda73b23213c (diff) | |
| parent | 325f6615254c871d71d9d71bb5910a61d9a61ea2 (diff) | |
| download | mariadb-git-350b4335696fc88efa2bbf2139d2f8bf9aa5701c.tar.gz | |
merge with 4.0
Diffstat (limited to 'mysql-test/install_test_db.sh')
| -rw-r--r-- | mysql-test/install_test_db.sh | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh index 11ed1bb312c..ac5435f9832 100644 --- a/mysql-test/install_test_db.sh +++ b/mysql-test/install_test_db.sh @@ -5,20 +5,27 @@ # 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 - shift 1 - execdir=../bin - bindir=../bin - BINARY_DIST=1 - fix_bin=mysql-test - scriptdir=../bin - libexecdir=../libexec +if [ x$1 = x"--bin" ]; then + shift 1 + + # 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 + scriptdir=../bin + libexecdir=../libexec else - execdir=../sql - bindir=../client - fix_bin=. - scriptdir=../scripts - libexecdir=../libexec + execdir=../sql + bindir=../client + fix_bin=. + scriptdir=../scripts + libexecdir=../libexec fi vardir=var |