diff options
author | Chad MILLER <chad@mysql.com> | 2008-08-06 09:25:03 -0400 |
---|---|---|
committer | Chad MILLER <chad@mysql.com> | 2008-08-06 09:25:03 -0400 |
commit | ff577e3590030de1597a37d0526a32fd32825f4b (patch) | |
tree | 191f411573b11678d1ea9329b81bbe41fa24a033 /netware/BUILD/nwbootstrap | |
parent | 7f615b2c14d3c8d7b7fbd777faa0adeba9a35fdc (diff) | |
download | mariadb-git-ff577e3590030de1597a37d0526a32fd32825f4b.tar.gz |
Bug#30129: mysql_install_db appears to run normally, but the databases \
are not created {Netware}
The init and test sql files were not created at cross-compilation time.
Now, make them in the default build rule. Additionally, remove the "fix"
SQL instructions, which are unnecessary for newly initialized databases.
Also, clean up the english in an error message, and BZRify nwbootstrap.
Diffstat (limited to 'netware/BUILD/nwbootstrap')
-rwxr-xr-x | netware/BUILD/nwbootstrap | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/netware/BUILD/nwbootstrap b/netware/BUILD/nwbootstrap index e0c0b926619..7ea8b9fc4b8 100755 --- a/netware/BUILD/nwbootstrap +++ b/netware/BUILD/nwbootstrap @@ -91,8 +91,8 @@ done echo "starting build..." # check for bk and repo_dir -bk help > /dev/null -repo_dir=`bk root $repo_dir` +bzr help > /dev/null +repo_dir=`bzr root $repo_dir` cd $repo_dir doc_dir="$repo_dir/../mysqldoc" @@ -100,7 +100,7 @@ doc_dir="$repo_dir/../mysqldoc" temp_dir="$build_dir/mysql-$$.tmp" # export the bk tree -command="bk export"; +command="bzr export"; if test $revision; then command="$command -r$revision"; fi command="$command $temp_dir" echo "exporting $repo_dir..." @@ -178,6 +178,8 @@ awk 'BEGIN{x=0;} END{printf("\n");} x==1 {printf(" %s",$1); x++; next} x>1 {pri # build linux tools echo "compiling linux tools..." ./netware/BUILD/compile-linux-tools +test -f ./netware/init_db.sql # this must exist +test -f ./netware/test_db.sql # this must exist # compile if test $build |