diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-01-11 13:50:48 -0700 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-01-11 13:50:48 -0700 |
| commit | 44318bbbddf0eec0f7b4b0fc9d11678750600f7c (patch) | |
| tree | d5ad489509eb68843615a2f7425506f6d90d1fef /mysql-test/install_test_db.sh | |
| parent | e64f4fdebb11a60bed4d8e367d9c99ab50e6e89d (diff) | |
| parent | a4817aced500feede54a9548b650650e513b69d9 (diff) | |
| download | mariadb-git-44318bbbddf0eec0f7b4b0fc9d11678750600f7c.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build
into siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
BitKeeper/deleted/.del-CMakeLists.txt~3:
Auto merged
BitKeeper/deleted/.del-README~1:
Auto merged
BitKeeper/deleted/.del-configure.js:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
configure.in:
Manual merge
mysql-test/install_test_db.sh:
Manual merge
sql/mysqld.cc:
Manual merge
Diffstat (limited to 'mysql-test/install_test_db.sh')
| -rw-r--r-- | mysql-test/install_test_db.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh index 4ca3e32a9a0..74d95fdc521 100644 --- a/mysql-test/install_test_db.sh +++ b/mysql-test/install_test_db.sh @@ -66,14 +66,17 @@ ldata=$fix_bin/$data mdata=$data/mysql EXTRA_ARG="" -if test ! -x $execdir/mysqld +mysqld= +if test -x $execdir/mysqld then + mysqld=$execdir/mysqld +else if test ! -x $libexecdir/mysqld then echo "mysqld is missing - looked in $execdir and in $libexecdir" exit 1 else - execdir=$libexecdir + mysqld=$libexecdir/mysqld fi fi @@ -99,7 +102,9 @@ basedir=. EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/" fi -mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --tmpdir=. $EXTRA_ARG" +mysqld_boot="${MYSQLD_BOOTSTRAP-$mysqld}" + +mysqld_boot="$mysqld_boot --no-defaults --bootstrap --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --tmpdir=. $EXTRA_ARG" echo "running $mysqld_boot" if $scriptdir/mysql_create_system_tables test $mdata $hostname | $mysqld_boot |