bzr push into mysql-6.0 branch (jperkin:2788 to 2789) Bug#33300

[Jonathan Perkin]

 2789 Jonathan Perkin	2008-08-20 [merge]
      merge fix for bug#33300 into mysql-6.0-bugteam
modified:
  Makefile.am

 2788 Georgi Kodinov	2008-08-20
      fixing a merge of 6.0-main -> 6.0-opt
modified:
  sql/sql_yacc.yy

=== modified file 'Makefile.am'
--- a/Makefile.am	2008-06-30 20:21:41 +0000
+++ b/Makefile.am	2008-08-20 13:35:18 +0000
@@ -54,7 +54,7 @@ bin-dist:		all
 	$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@
 
 # Remove BK's "SCCS" subdirectories from source distribution
-# Create initial database files for Windows installations.
+# Create initial database files for Windows installations and check them.
 dist-hook:
 	rm -rf `find $(distdir) -type d -name SCCS -print`
 	mkdir -p $(distdir)/win
@@ -62,6 +62,7 @@ dist-hook:
 		--builddir=$(top_builddir) \
 		--datadir=$(distdir)/win/data \
 		--srcdir=$(top_srcdir)
+	storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI
 
 tags:
 	support-files/build-tags