List:Commits« Previous MessageNext Message »
From:tomas Date:January 17 2006 3:16pm
Subject:bk commit into 5.1 tree (tomas:1.2066)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2066 06/01/17 16:15:54 tomas@stripped +2 -0
  fix my_compress/zlib link error

  storage/ndb/tools/Makefile.am
    1.25 06/01/17 16:15:47 tomas@stripped +1 -1
    fix my_compress/zlib link error

  storage/ndb/config/type_ndbapitools.mk.am
    1.11 06/01/17 16:15:47 tomas@stripped +1 -1
    fix my_compress/zlib link error

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.24/storage/ndb/tools/Makefile.am	2006-01-17 09:24:54 +01:00
+++ 1.25/storage/ndb/tools/Makefile.am	2006-01-17 16:15:47 +01:00
@@ -55,7 +55,7 @@
 ndb_show_tables_LDFLAGS = @ndb_bin_am_ldflags@
 ndb_select_all_LDFLAGS = @ndb_bin_am_ldflags@
 ndb_select_count_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_restore_LDFLAGS = @ndb_bin_am_ldflags@ @ZLIB_LIBS@
+ndb_restore_LDFLAGS = @ndb_bin_am_ldflags@
 ndb_config_LDFLAGS = @ndb_bin_am_ldflags@
 
 # Don't update the files from bitkeeper

--- 1.10/storage/ndb/config/type_ndbapitools.mk.am	2005-04-27 04:04:32 +02:00
+++ 1.11/storage/ndb/config/type_ndbapitools.mk.am	2006-01-17 16:15:47 +01:00
@@ -3,7 +3,7 @@
          $(top_builddir)/storage/ndb/src/libndbclient.la \
          $(top_builddir)/dbug/libdbug.a \
          $(top_builddir)/mysys/libmysys.a \
-         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
+         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ @ZLIB_LIBS@
 
 INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
 	-I$(top_srcdir)/storage/ndb/include \
Thread
bk commit into 5.1 tree (tomas:1.2066)tomas17 Jan