Commit d344d81c authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
mysql-test/install_test_db.sh:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
netware/Makefile.am:
  Manual merge
parents ed0badb1 2176fef4

mysql-test/install_test_db.sh

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ fi 


INSTALL_CMD="$scriptdir/mysql_install_db --no-defaults $EXTRA_ARG --basedir=$basedir --datadir=mysql-test/$ldata --srcdir=."

echo "running $INSTALL_CMD"



cd ..

if $INSTALL_CMD

then