Commit 22ed311f authored by unknown's avatar unknown
Browse files

Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
mysys/string.c:
  Auto merged
storage/ndb/src/Makefile.am:
  Auto merged
parents 115fbd6b 74eac22e

.bzrignore

+2 −1
Original line number Diff line number Diff line
@@ -1644,6 +1644,7 @@ ndb/src/kernel/error/liberror.dsp 
ndb/src/kernel/ndbd

ndb/src/kernel/ndbd.dsp

ndb/src/kernel/vm/libkernel.dsp

ndb/src/libndb.ver

ndb/src/libndbclient.dsp

ndb/src/mgmapi/libmgmapi.dsp

ndb/src/mgmclient/libndbmgmclient.dsp
@@ -2638,6 +2639,7 @@ storage/ndb/src/kernel/error/liberror.dsp 
storage/ndb/src/kernel/ndbd

storage/ndb/src/kernel/ndbd.dsp

storage/ndb/src/kernel/vm/libkernel.dsp

storage/ndb/src/libndb.ver

storage/ndb/src/libndbclient.dsp

storage/ndb/src/mgmapi/libmgmapi.dsp

storage/ndb/src/mgmclient/libndbmgmclient.dsp
@@ -2934,4 +2936,3 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj
 
storage/ndb/src/libndb.ver

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -360,8 +360,8 @@ AC_SUBST(LD_VERSION_SCRIPT) 


# libndbclient versioning when linked with GNU ld.

if $LD --version 2>/dev/null|grep -q GNU; then

  NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/storage/ndb/src/libndb.ver"

  AC_CONFIG_FILES(storage/ndb/src/libndb.ver)

  NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/ndb/src/libndb.ver"

  AC_CONFIG_FILES(ndb/src/libndb.ver)

fi

AC_SUBST(NDB_LD_VERSION_SCRIPT)

storage/ndb/src/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ libndbclient_la_SOURCES = 


libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@ @NDB_LD_VERSION_SCRIPT@



BUILT_SOURCES = libndb.ver



libndbclient_la_LIBADD =  \

              ndbapi/libndbapi.la \

              common/transporter/libtransporter.la   \