Re: bk commit into 5.1 tree (knielsen:1.2555)

[Kristian Nielsen]

Jonas, Stewart,

This fixes azio build conflict in mysql-6.0-telco... (but patch is for
mysql-5.1-telco-6.3).

Does it look ok? If so I'll push to mysql-5.1-telco-6.3, mysql-5.1-telco-6.4,
and mysql-6.0-telco.

 - Kristian.

knielsen@stripped writes:

> Below is the list of changes that have just been committed into a local
> 5.1 repository of knielsen.  When knielsen 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-02-25 13:22:45+01:00, knielsen@ymer.(none) +3 -0
>   Fix conflict between archive and ndb azio (by creating libndbazio, and
>   only linking it into ndbd and ndb_restore).
>
>   storage/ndb/src/common/util/Makefile.am@stripped, 2008-02-25 13:22:41+01:00,
> knielsen@ymer.(none) +5 -3
>     Fix conflict between archive and ndb azio (by creating libndbazio, and
>     only linking it into ndbd and ndb_restore).
>
>   storage/ndb/src/kernel/Makefile.am@stripped, 2008-02-25 13:22:41+01:00,
> knielsen@ymer.(none) +1 -0
>     Fix conflict between archive and ndb azio (by creating libndbazio, and
>     only linking it into ndbd and ndb_restore).
>
>   storage/ndb/tools/Makefile.am@stripped, 2008-02-25 13:22:41+01:00, knielsen@ymer.(none)
> +3 -0
>     Fix conflict between archive and ndb azio (by creating libndbazio, and
>     only linking it into ndbd and ndb_restore).
>
> diff -Nrup a/storage/ndb/src/common/util/Makefile.am
> b/storage/ndb/src/common/util/Makefile.am
> --- a/storage/ndb/src/common/util/Makefile.am	2007-10-03 09:38:09 +02:00
> +++ b/storage/ndb/src/common/util/Makefile.am	2008-02-25 13:22:41 +01:00
> @@ -13,7 +13,7 @@
>  # along with this program; if not, write to the Free Software
>  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  
> -noinst_LTLIBRARIES = libgeneral.la
> +noinst_LTLIBRARIES = libgeneral.la libndbazio.la
>  
>  libgeneral_la_SOURCES = \
>  	    File.cpp md5_hash.cpp Properties.cpp socket_io.cpp \
> @@ -25,11 +25,13 @@ libgeneral_la_SOURCES = \
>              strdup.c \
>              ConfigValues.cpp ndb_init.c basestring_vsnprintf.c \
>              Bitmask.cpp \
> -	    ndb_rand.c azio.c
> +	    ndb_rand.c
>  
>  INCLUDES_LOC = @ZLIB_INCLUDES@
>  
> -libgeneral_la_LIBADD = @ZLIB_LIBS@
> +libndbazio_la_SOURCES = azio.c
> +
> +libndbazio_la_LIBADD = @ZLIB_LIBS@
>  
>  EXTRA_PROGRAMS = testBitmask
>  testBitmask_SOURCES =  testBitmask.cpp
> diff -Nrup a/storage/ndb/src/kernel/Makefile.am b/storage/ndb/src/kernel/Makefile.am
> --- a/storage/ndb/src/kernel/Makefile.am	2006-12-31 01:26:56 +01:00
> +++ b/storage/ndb/src/kernel/Makefile.am	2008-02-25 13:22:41 +01:00
> @@ -53,6 +53,7 @@ LDADD +=  \
>                $(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \
>                $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la      \
>                $(top_builddir)/storage/ndb/src/common/util/libgeneral.la  \
> +              $(top_builddir)/storage/ndb/src/common/util/libndbazio.la  \
>           $(top_builddir)/dbug/libdbug.a \
>           $(top_builddir)/mysys/libmysys.a \
>           $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
> diff -Nrup a/storage/ndb/tools/Makefile.am b/storage/ndb/tools/Makefile.am
> --- a/storage/ndb/tools/Makefile.am	2007-04-24 22:43:08 +02:00
> +++ b/storage/ndb/tools/Makefile.am	2008-02-25 13:22:41 +01:00
> @@ -60,6 +60,9 @@ ndb_config_CXXFLAGS = -I$(top_srcdir)/st
>                        -I$(top_srcdir)/storage/ndb/include/mgmcommon \
>                        -DMYSQLCLUSTERDIR="\"\""
>  
> +ndb_restore_LDADD = $(top_builddir)/storage/ndb/src/common/util/libndbazio.la \
> +                    $(LDADD)
> +
>  include $(top_srcdir)/storage/ndb/config/common.mk.am
>  include $(top_srcdir)/storage/ndb/config/type_ndbapitools.mk.am
>  
>
> -- 
> MySQL Code Commits Mailing List
> For list archives: http://lists.mysql.com/commits
> To unsubscribe:    http://lists.mysql.com/commits?unsub=1
>
>

-- 
Kristian Nielsen, Senior Software Engineer
MySQL AB, www.mysql.com
"Good. Cheap. Fast. Pick any two."