List:Commits« Previous MessageNext Message »
From:msvensson Date:January 4 2006 3:34pm
Subject:bk commit into 5.1 tree (msvensson:1.2031)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2031 06/01/04 16:34:03 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
  into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem

  include/Makefile.am
    1.58 06/01/04 16:33:58 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem/RESYNC

--- 1.57/include/Makefile.am	2005-12-22 05:10:56 +01:00
+++ 1.58/include/Makefile.am	2006-01-04 16:33:58 +01:00
@@ -34,7 +34,7 @@
 			my_vle.h
 
 # mysql_version.h are generated
-CLEANFILES =            mysql_version.h my_config.h readline
+CLEANFILES =            mysql_version.h my_config.h readline openssl
 
 # Some include files that may be moved and patched by configure
 DISTCLEANFILES =	sched.h $(CLEANFILES)
@@ -42,6 +42,7 @@
 link_sources:
 	-$(RM) -fr readline
 	@readline_h_ln_cmd@
+	@yassl_h_ln_cmd@
 
 my_config.h: ../config.h
 	$(CP) ../config.h my_config.h
Thread
bk commit into 5.1 tree (msvensson:1.2031)msvensson4 Jan