Commit 55b78e44 authored by unknown's avatar unknown
Browse files

Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  devsrv-b.mysql.com:/space/magnus/my41-bug14634
parents 1c507058 22bc685d

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1057,3 +1057,4 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

libmysql/libmysql.ver

configure.in

+10 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ AM_CONFIG_HEADER(config.h) 
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_DEFINE_UNQUOTED([PROTOCOL_VERSION], [$PROTOCOL_VERSION], 
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)
@@ -431,6 +433,13 @@ then 
  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")

# Any wariation of Linux

libmysql/Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ mysysobjects2 = my_lib.lo 
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)

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -2733,7 +2733,7 @@ my_bool STDCALL mysql_stmt_attr_get(MYSQL_STMT *stmt, 
{

  switch (attr_type) {

  case STMT_ATTR_UPDATE_MAX_LENGTH:

    *(unsigned long *) value= stmt->update_max_length;

    *(my_bool*) value= stmt->update_max_length;

    break;

  default:

    return TRUE;

libmysql/libmysql.ver.in

0 → 100644
+1 −0
Original line number Diff line number Diff line 
libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };