List:Commits« Previous MessageNext Message »
From:Monty Taylor Date:January 19 2007 12:31am
Subject:bk commit into 5.1 tree (mtaylor:1.2413) BUG#13522
View as plain text  
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-01-18 16:31:43-08:00, mtaylor@qualinost.(none) +3 -0
  Add code to actually version the symbols in the library, and not just the library. bug #13522

  configure.in@stripped, 2007-01-18 16:31:41-08:00, mtaylor@qualinost.(none) +12 -0
    Add code to actually version the symbols in the library, and not just the library. bug #13522

  storage/ndb/src/Makefile.am@stripped, 2007-01-18 16:31:41-08:00, mtaylor@qualinost.(none) +1 -1
    Add code to actually version the symbols in the library, and not just the library. bug #13522

  storage/ndb/src/libndb.ver.in@stripped, 2007-01-18 15:39:55-08:00, mtaylor@qualinost.(none) +2 -0
    BitKeeper file /home/mtaylor/src/mysql-5.1-new-maint/storage/ndb/src/libndb.ver.in

  storage/ndb/src/libndb.ver.in@stripped, 2007-01-18 15:39:55-08:00, mtaylor@qualinost.(none) +0 -0

# 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:	mtaylor
# Host:	qualinost.(none)
# Root:	/home/mtaylor/src/mysql-5.1-new-maint

--- 1.421/configure.in	2007-01-18 16:31:49 -08:00
+++ 1.422/configure.in	2007-01-18 16:31:49 -08:00
@@ -15,6 +15,8 @@
 # See the libtool docs for information on how to do shared lib versions.
 SHARED_LIB_MAJOR_VERSION=15
 SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
+NDB_SHARED_LIB_MAJOR_VERSION=3
+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
 MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
@@ -58,6 +60,8 @@
                    [Version of .frm files])
 AC_SUBST(SHARED_LIB_MAJOR_VERSION)
 AC_SUBST(SHARED_LIB_VERSION)
+AC_SUBST(NDB_SHARED_LIB_MAJOR_VERSION)
+AC_SUBST(NDB_SHARED_LIB_VERSION)
 AC_SUBST(AVAILABLE_LANGUAGES)
 
 
@@ -353,6 +357,14 @@
   AC_CONFIG_FILES(libmysql/libmysql.ver)
 fi
 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)
+fi
+AC_SUBST(NDB_LD_VERSION_SCRIPT)
+
 
 # Avoid bug in fcntl on some versions of linux
 AC_MSG_CHECKING([if we should use 'skip-external-locking' as default for $target_os])
--- New file ---
+++ storage/ndb/src/libndb.ver.in	07/01/18 15:39:55
libndbclient_@NDB_SHARED_LIB_MAJOR_VERSION@ { global: *; };



--- 1.17/storage/ndb/src/Makefile.am	2007-01-18 16:31:49 -08:00
+++ 1.18/storage/ndb/src/Makefile.am	2007-01-18 16:31:49 -08:00
@@ -21,7 +21,7 @@
 
 libndbclient_la_SOURCES =
 
-libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@
+libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@ @NDB_LD_VERSION_SCRIPT@
 
 libndbclient_la_LIBADD =  \
               ndbapi/libndbapi.la \
Thread
bk commit into 5.1 tree (mtaylor:1.2413) BUG#13522Monty Taylor19 Jan