List:Internals« Previous MessageNext Message »
From:Joerg Bruehe Date:March 3 2005 3:01pm
Subject:bk commit into 5.0 tree (joerg:1.1788)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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
  1.1788 05/03/03 16:01:39 joerg@stripped +1 -0
  Ensure that '*.disabled' files are truly optional, so that their non-existence
  will not cause "make" to fail.

  mysql-test/Makefile.am
    1.43 05/03/03 16:01:35 joerg@stripped +3 -2
    Files of the '*.disabled' pattern may exist, but need not.
    So it is important to ignore command failures arising from this pattern not finding
    any matches - whereas files of the other types must be present.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M50/push-5.0

--- 1.42/mysql-test/Makefile.am	Thu Feb 17 19:44:26 2005
+++ 1.43/mysql-test/Makefile.am	Thu Mar  3 16:01:35 2005
@@ -45,7 +45,8 @@
 dist-hook:
 	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
 		$(distdir)/std_data
-	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.disabled $(distdir)/t
+	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
+	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t
 	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include
 	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.result.es $(srcdir)/r/*.require $(distdir)/r
@@ -63,7 +64,7 @@
 		$(DESTDIR)$(testdir)/std_data
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
-	$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t
+	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t
Thread
bk commit into 5.0 tree (joerg:1.1788)Joerg Bruehe3 Mar