bk commit into 4.1 tree (mtaylor:1.2599) BUG#13522

[Monty Taylor]

Below is the list of changes that have just been committed into a local
4.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-11 01:42:55-08:00, mtaylor@qualinost.(none) +2 -0
  Adding support for versioned libndbclient.so. bug #13522

  configure.in@stripped, 2007-01-11 01:42:54-08:00, mtaylor@qualinost.(none) +5 -0
    Added variables to support ndbclient library versioning.

  ndb/src/Makefile.am@stripped, 2007-01-11 01:42:54-08:00, mtaylor@qualinost.(none) +2 -0
    Making use of new variables. Adding support for versioned libraries.

# 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-4.1-maint

--- 1.420/configure.in	2007-01-11 01:43:00 -08:00
+++ 1.421/configure.in	2007-01-11 01:43:00 -08:00
@@ -20,6 +20,9 @@
 NDB_VERSION_BUILD=23
 NDB_VERSION_STATUS=""
 
+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
 MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
@@ -73,6 +76,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)
 AC_SUBST(AVAILABLE_LANGUAGES_ERRORS)
 AC_SUBST_FILE(AVAILABLE_LANGUAGES_ERRORS_RULES)

--- 1.12/ndb/src/Makefile.am	2007-01-11 01:43:00 -08:00
+++ 1.13/ndb/src/Makefile.am	2007-01-11 01:43:00 -08:00
@@ -6,6 +6,8 @@
 
 libndbclient_la_SOURCES =
 
+libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@
+
 libndbclient_la_LIBADD =  \
               ndbapi/libndbapi.la \
               common/transporter/libtransporter.la   \