summaryrefslogtreecommitdiff
path: root/netware/Makefile.am
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2008-08-06 09:25:03 -0400
committerChad MILLER <chad@mysql.com>2008-08-06 09:25:03 -0400
commita308c9e3fae8c510f6775f9e19c41b04b3a8194e (patch)
tree191f411573b11678d1ea9329b81bbe41fa24a033 /netware/Makefile.am
parent47cd6462fdc4139342ac74d26a8989666fdf4b3a (diff)
downloadmariadb-git-a308c9e3fae8c510f6775f9e19c41b04b3a8194e.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/Makefile.am')
-rw-r--r--netware/Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/netware/Makefile.am b/netware/Makefile.am
index 2e9ff2b59d6..7ad045d433d 100644
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
@@ -103,8 +103,7 @@ init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
@echo "CREATE DATABASE mysql;" > $@;
@echo "CREATE DATABASE test;" >> $@;
@echo "use mysql;" >> $@;
- @cat $(top_srcdir)/scripts/mysql_system_tables.sql \
- $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;
+ @cat $(top_srcdir)/scripts/mysql_system_tables.sql >> $@;
# Build test_db.sql from init_db.sql plus
# some test data