MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Chad MILLER Date:November 2 2006 7:27pm
Subject:bk commit into 5.1 tree (cmiller:1.2341)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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, 2006-11-02 14:26:54-05:00, cmiller@stripped +1 -0
  Fixed misuse of automake _DEPENDENCIES item.  It caused Make try to create
  a bogus dependency "-lz" .

  sql/Makefile.am@stripped, 2006-11-02 14:26:46-05:00, cmiller@stripped +4 -3
    automake "_DEPENDENCIES" names seem only to strip out compiler flags when 
    it's automatically created.  Manually written dependencies must be clean.

# 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:	cmiller
# Host:	calliope.local
# Root:	/Volumes/Source/src/mysql-5.1-maint

--- 1.161/sql/Makefile.am	2006-11-02 14:27:11 -05:00
+++ 1.162/sql/Makefile.am	2006-11-02 14:27:11 -05:00
@@ -30,12 +30,13 @@
 EXTRA_PROGRAMS =	gen_lex_hash
 bin_PROGRAMS =		mysql_tzinfo_to_sql
 gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
-LDADD =			$(top_builddir)/vio/libvio.a \
+SUPPORTING_LIBS =			$(top_builddir)/vio/libvio.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/regex/libregex.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-mysqld_DEPENDENCIES=	@mysql_plugin_libs@ $(LDADD)
+			$(top_builddir)/strings/libmystrings.a
+mysqld_DEPENDENCIES=	@mysql_plugin_libs@ $(SUPPORTING_LIBS)
+LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@
 mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \
 			@pstack_libs@ \
 			@mysql_plugin_libs@ \
Thread
bk commit into 5.1 tree (cmiller:1.2341)Chad MILLER2 Nov