bk commit into 6.0 tree (hakank:1.2678) BUG#36492

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakank.  When hakank does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-19 21:32:47+02:00, hakank@lu0011.(none) +1 -0
  Fix for Bug#36492 make dist and make install fails.
  Also fixed whitespace to have consistent usage of TAB.

  mysql-test/Makefile.am@stripped, 2008-05-19 21:32:43+02:00, hakank@lu0011.(none) +5 -5
    Fix for Bug#36492 make dist and make install fails.
    Also fixed whitespace to have consistent usage of TAB.

diff -Nrup a/mysql-test/Makefile.am b/mysql-test/Makefile.am
--- a/mysql-test/Makefile.am	2008-05-13 15:57:31 +02:00
+++ b/mysql-test/Makefile.am	2008-05-19 21:32:43 +02:00
@@ -35,8 +35,8 @@ INCLUDES =		-I$(top_builddir)/include -I
 dist-hook:
 	mkdir -p \
 		$(distdir)/t \
-                $(distdir)/extra/binlog_tests \
-                $(distdir)/extra/rpl_tests \
+		$(distdir)/extra/binlog_tests \
+		$(distdir)/extra/rpl_tests \
 		$(distdir)/r \
 		$(distdir)/include \
 		$(distdir)/std_data \
@@ -49,7 +49,7 @@ dist-hook:
 		$(distdir)/std_data/ndb_backup51_d2_le \
 		$(distdir)/std_data/parts \
 		$(distdir)/lib \
-                $(distdir)/std_data/funcs_1 \
+		$(distdir)/std_data/funcs_1 \
 		$(distdir)/lib/My
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
@@ -83,7 +83,7 @@ dist-hook:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_be/BACKUP*
$(distdir)/std_data/ndb_backup51_d2_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_le/BACKUP*
$(distdir)/std_data/ndb_backup51_d2_le
 	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(distdir)/std_data/parts
-	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/*.txt $(distdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
 	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My
 	-rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock
@@ -144,7 +144,7 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_be/BACKUP*
$(DESTDIR)$(testdir)/std_data/ndb_backup51_d2_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_le/BACKUP*
$(DESTDIR)$(testdir)/std_data/ndb_backup51_d2_le
 	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(DESTDIR)$(testdir)/std_data/parts
-	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(DESTDIR)$(testdir)/std_data/funcs_1
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/*.txt $(DESTDIR)$(testdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
 	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My
 	for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \