bk commit into 4.1 tree (svoj:1.2475) BUG#3074

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
4.1 repository of svoj. When svoj 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
  1.2475 06/01/17 18:51:08 svoj@april.(none) +4 -0
  BUG#3074: Unversioned symbols in shared library
  libmysqlclient versioning when linked with GNU ld.

  libmysql/libmysql.ver.in
    1.1 06/01/17 18:51:05 svoj@april.(none) +1 -0
    New BitKeeper file ``libmysql/libmysql.ver.in''

  libmysql/libmysql.ver.in
    1.0 06/01/17 18:51:05 svoj@april.(none) +0 -0
    BitKeeper file /home/svoj/devel/mysql/BUG3074/mysql-4.1/libmysql/libmysql.ver.in

  libmysql/Makefile.shared
    1.58 06/01/17 18:51:05 svoj@april.(none) +1 -1
    libmysqlclient versioning when linked with GNU ld.

  configure.in
    1.401 06/01/17 18:51:05 svoj@april.(none) +10 -1
    libmysqlclient versioning when linked with GNU ld.

  BitKeeper/etc/ignore
    1.234 06/01/17 18:51:05 svoj@april.(none) +1 -0
    Added libmysql/libmysql.ver to the ignore list

# 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:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG3074/mysql-4.1

--- 1.400/configure.in	2005-12-01 00:50:04 +04:00
+++ 1.401/configure.in	2006-01-17 18:51:05 +04:00
@@ -11,7 +11,8 @@
 PROTOCOL_VERSION=10
 DOT_FRM_VERSION=6
 # See the libtool docs for information on how to do shared lib versions.
-SHARED_LIB_VERSION=14:0:0
+SHARED_LIB_MAJOR_VERSION=14
+SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
 
 # ndb version
 NDB_VERSION_MAJOR=4
@@ -68,6 +69,7 @@
 AC_SUBST(DOT_FRM_VERSION)
 AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION],
                    [Version of .frm files])
+AC_SUBST(SHARED_LIB_MAJOR_VERSION)
 AC_SUBST(SHARED_LIB_VERSION)
 AC_SUBST(AVAILABLE_LANGUAGES)
 AC_SUBST(AVAILABLE_LANGUAGES_ERRORS)
@@ -430,6 +432,13 @@
     fi
   fi
 fi
+
+# libmysqlclient versioning when linked with GNU ld.
+if $LD --version 2>/dev/null|grep -q GNU; then
+  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmysql/libmysql.ver"
+  AC_CONFIG_FILES(libmysql/libmysql.ver)
+fi
+AC_SUBST(LD_VERSION_SCRIPT)
 
 # Avoid bug in fcntl on some versions of linux
 AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")

--- 1.233/BitKeeper/etc/ignore	2005-09-15 19:16:58 +05:00
+++ 1.234/BitKeeper/etc/ignore	2006-01-17 18:51:05 +04:00
@@ -1057,3 +1057,4 @@
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+libmysql/libmysql.ver
--- New file ---
+++ libmysql/libmysql.ver.in	06/01/17 18:51:05
libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };


--- 1.57/libmysql/Makefile.shared	2005-05-05 23:37:43 +05:00
+++ 1.58/libmysql/Makefile.shared	2006-01-17 18:51:05 +04:00
@@ -75,7 +75,7 @@
 mysysobjects =		$(mysysobjects1) $(mysysobjects2)
 target_libadd =		$(mysysobjects) $(mystringsobjects) $(dbugobjects) \
  $(sql_cmn_objects) $(vio_objects) $(sqlobjects)
-target_ldflags = -version-info @SHARED_LIB_VERSION@
+target_ldflags = -version-info @SHARED_LIB_VERSION@ @LD_VERSION_SCRIPT@ 
 vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo
 CLEANFILES =		$(target_libadd) $(SHLIBOBJS) \
 			$(target)