List:Commits« Previous MessageNext Message »
From:Sergey Vojtovich Date:January 17 2006 8:02pm
Subject:bk commit into 4.1 tree (svoj:1.2476)
View as plain text  
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.2476 06/01/18 00:02:25 svoj@april.(none) +1 -0
  Merge svojtovich@stripped:/home/bk/mysql-4.1
  into  april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1

  configure.in
    1.402 06/01/18 00:02:21 svoj@april.(none) +0 -0
    Auto merged

# 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/RESYNC

--- 1.401/configure.in	2006-01-17 15:55:26 +04:00
+++ 1.402/configure.in	2006-01-18 00:02:21 +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")
Thread
bk commit into 4.1 tree (svoj:1.2476)Sergey Vojtovich17 Jan