1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
unknown 2007-01-19 14:30:41 -08:00
commit 22ed311f3a
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.bzrignore
View File

@ -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

4
configure.in
View File

@ -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)

2
storage/ndb/src/Makefile.am
View File

@ -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 \