bk commit into 4.1 tree (svoj:1.2479) 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.2479 06/01/16 19:31:38 svoj@april.(none) +4 -0
  BUG#3074: Unversioned symbols in shared library
  libmysqlclient versioning when linked with GNU ld.

  libmysql/libmysql.ver
    1.1 06/01/16 19:28:37 svoj@april.(none) +1 -0
    New BitKeeper file ``libmysql/libmysql.ver''

  libmysql/libmysql.ver
    1.0 06/01/16 19:28:37 svoj@april.(none) +0 -0
    BitKeeper file /home/svoj/devel/mysql/BUG3074/mysql-4.1/libmysql/libmysql.ver

  libmysql/Makefile.shared
    1.58 06/01/16 19:28:37 svoj@april.(none) +1 -1
    libmysqlclient versioning when linked with GNU ld.

  libmysql/Makefile.am
    1.43 06/01/16 19:28:37 svoj@april.(none) +1 -1
    libmysql.ver added to dist.

  configure.in
    1.401 06/01/16 19:28:37 svoj@april.(none) +6 -0
    libmysqlclient versioning when linked with GNU ld.

# 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-16 19:28:37 +04:00
@@ -431,6 +431,12 @@
   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"
+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")
 # Any wariation of Linux

--- 1.42/libmysql/Makefile.am	2005-09-24 18:51:28 +05:00
+++ 1.43/libmysql/Makefile.am	2006-01-16 19:28:37 +04:00
@@ -31,7 +31,7 @@
 libmysqlclient_la_SOURCES = $(target_sources)
 libmysqlclient_la_LIBADD = $(target_libadd)
 libmysqlclient_la_LDFLAGS = $(target_ldflags)
-EXTRA_DIST = Makefile.shared libmysql.def
+EXTRA_DIST = Makefile.shared libmysql.def libmysql.ver
 noinst_HEADERS = client_settings.h
 
 # This is called from the toplevel makefile
--- New file ---
+++ libmysql/libmysql.ver	06/01/16 19:28:37
MYSQL_4.1 { global: *; };


--- 1.57/libmysql/Makefile.shared	2005-05-05 23:37:43 +05:00
+++ 1.58/libmysql/Makefile.shared	2006-01-16 19:28:37 +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)