diff options
| author | unknown <monty@mysql.com> | 2004-03-12 01:13:04 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-12 01:13:04 +0200 |
| commit | 965158f28fa9527c62b3c316c458a8753a5da4e4 (patch) | |
| tree | 5e4aed5605eda5dab05891e904dddd1af46c1f54 /mysql-test/install_test_db.sh | |
| parent | bebe22a99e0b48b09c4ac69561ede17ff1766b1a (diff) | |
| parent | dd8b25510e11ca35c37bb9949810ac84c6d7ce29 (diff) | |
| download | mariadb-git-965158f28fa9527c62b3c316c458a8753a5da4e4.tar.gz | |
Merge
mysql-test/install_test_db.sh:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/mysql-test-run.sh:
SCCS merged
Diffstat (limited to 'mysql-test/install_test_db.sh')
| -rw-r--r-- | mysql-test/install_test_db.sh | 11 |
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 |