Re: bk commit into 5.1 tree (mtaylor:1.2577) BUG#29791

[Stewart Smith]

Kinda looks okay to me.. the bump of the version number should probably
be okayed by tomas


On Wed, 2007-11-14 at 15:20 -0800, Monty Taylor wrote:
> Below is the list of changes that have just been committed into a local
> 5.1 repository of mtaylor. When mtaylor 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, 2007-11-14 15:20:32-08:00, mtaylor@solace.(none) +4 -0
>   BUG#29791 relocation R_X86_64_32 against `a local symbol'
>   
>   Added libtool helper lib to prevent link failures on amd64. The non-installed 
>   libtool convenience lib removes the need to compile libmysys and libmystrings with
>   -fPIC on amd64. 
> 
>   config/ac-macros/ha_ndbcluster.m4@stripped, 2007-11-14 15:20:30-08:00,
> mtaylor@solace.(none) +1 -0
>     BUG#29791 relocation R_X86_64_32 against `a local symbol'
>     
>     Added libtool helper lib to prevent link failures on amd64
> 
>   configure.in@stripped, 2007-11-14 15:20:30-08:00, mtaylor@solace.(none) +2 -1
>     BUG#29791 relocation R_X86_64_32 against `a local symbol'
>     
>     Bumped NDB_SHARED_LIB_MAJOR_VERSION because we now include extra symbols.
> Previous
>     programs linked against libndbclient3 and libmystrings and libmysys may need to
> be
>     relinked without libmystrings and libmysys now to prevent duplicate symbols. 
> 
>   storage/ndb/src/Makefile.am@stripped, 2007-11-14 15:20:31-08:00, mtaylor@solace.(none)
> +2 -1
>     BUG#29791 relocation R_X86_64_32 against `a local symbol'
>     
>     Added libtool helper lib to prevent link failures on amd64
> 
>   storage/ndb/src/helper/Makefile.am@stripped, 2007-11-14 15:20:31-08:00,
> mtaylor@solace.(none) +41 -0
>     BUG#29791 relocation R_X86_64_32 against `a local symbol'
>     
>     Added libtool helper lib to prevent link failures on amd64.
>     Define symbols which libndb requires but are not part of NDB or 
>     libmysqlclient code. The list was arrived at by comparing undef'd symbols in 
>     libndbclient against symbols in libmysqlclient and adding the missing ones. 
> 
>   storage/ndb/src/helper/Makefile.am@stripped, 2007-11-14 15:20:31-08:00,
> mtaylor@solace.(none) +0 -0
> 
> diff -Nrup a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
> --- a/config/ac-macros/ha_ndbcluster.m4	2007-08-01 00:23:54 -07:00
> +++ b/config/ac-macros/ha_ndbcluster.m4	2007-11-14 15:20:30 -08:00
> @@ -361,6 +361,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
>     storage/ndb/src/mgmclient/Makefile dnl
>     storage/ndb/src/cw/Makefile dnl
>     storage/ndb/src/cw/cpcd/Makefile dnl
> +   storage/ndb/src/helper/Makefile dnl
>     storage/ndb/test/Makefile dnl
>     storage/ndb/test/src/Makefile dnl
>     storage/ndb/test/ndbapi/Makefile dnl
> diff -Nrup a/configure.in b/configure.in
> --- a/configure.in	2007-08-31 08:49:25 -07:00
> +++ b/configure.in	2007-11-14 15:20:30 -08:00
> @@ -18,7 +18,7 @@ DOT_FRM_VERSION=6
>  # See the libtool docs for information on how to do shared lib versions.
>  SHARED_LIB_MAJOR_VERSION=16
>  SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
> -NDB_SHARED_LIB_MAJOR_VERSION=3
> +NDB_SHARED_LIB_MAJOR_VERSION=4
>  NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
>  # Set all version vars based on $VERSION. How do we do this more elegant ?
>  # Remember that regexps needs to quote [ and ] since this is run through m4
> @@ -336,6 +336,7 @@ case "$target_os" in
>      fi
>    ;;
>  esac
> +
>  AC_SUBST(CC)
>  AC_SUBST(CFLAGS)
>  AC_SUBST(CXX)
> diff -Nrup a/storage/ndb/src/Makefile.am b/storage/ndb/src/Makefile.am
> --- a/storage/ndb/src/Makefile.am	2007-01-19 16:54:51 -08:00
> +++ b/storage/ndb/src/Makefile.am	2007-11-14 15:20:31 -08: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
>  
> -SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw
> +SUBDIRS = helper common mgmapi ndbapi . kernel mgmclient mgmsrv cw
>  
>  include $(top_srcdir)/storage/ndb/config/common.mk.am
>  
> @@ -25,6 +25,7 @@ libndbclient_la_LDFLAGS = -version-info 
>  
>  libndbclient_la_LIBADD =  \
>                ndbapi/libndbapi.la \
> +              helper/libndbhelper.la \
>                common/transporter/libtransporter.la   \
>                common/debugger/libtrace.la     \
>                common/debugger/signaldata/libsignaldataprint.la \
> diff -Nrup a/storage/ndb/src/helper/Makefile.am b/storage/ndb/src/helper/Makefile.am
> --- /dev/null	Wed Dec 31 16:00:00 196900
> +++ b/storage/ndb/src/helper/Makefile.am	2007-11-14 15:20:31 -08:00
> @@ -0,0 +1,41 @@
> +# Copyright (C) 2007 MySQL AB
> +# 
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; version 2 of the License.
> +# 
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +# 
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> +
> +# Define symbols which libndb requires but are not part of NDB or 
> +# libmysqlclient code. This library removes the need to compile libmysys
> +# and libmystrings with -fPIC on amd64 platforms - and also removes
> +# the need to compile NDB API programs with -lmysys or -lmystrings
> + 
> +include $(top_srcdir)/storage/ndb/config/common.mk.am
> +
> +noinst_LTLIBRARIES = libndbhelper.la
> +
> +libndbhelper_la_CPPFLAGS = \
> +	-I$(top_srcdir)/include \
> +	-I$(top_srcdir)/mysys
> +
> +libndbhelper_la_SOURCES = \
> +       $(top_srcdir)/mysys/base64.c \
> +       $(top_srcdir)/mysys/errors.c \
> +       $(top_srcdir)/mysys/my_thr_init.c \
> +       $(top_srcdir)/mysys/my_static.c \
> +       $(top_srcdir)/mysys/my_messnc.c \
> +       $(top_srcdir)/mysys/my_error.c \
> +       $(top_srcdir)/mysys/my_pthread.c \
> +       $(top_srcdir)/mysys/my_getwd.c \
> +       $(top_srcdir)/strings/decimal.c
> +
> +# Don't update the files from bitkeeper
> +%::SCCS/s.%

-- 
Stewart Smith, Senior Software Engineer
MySQL AB, www.mysql.com
Office: [phone] Ext: 6616
VoIP: 6616@stripped
Mobile: [phone]

Jumpstart your cluster:
http://www.mysql.com/consulting/packaged/cluster.html

Attachment: [application/pgp-signature] This is a digitally signed message part signature.asc

Attachment: [application/pgp-signature]