Commit 2b1185ed authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/field.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
parents a2da9aed d297a221

.bzrignore

+2 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
50

=6

BUILD/compile-pentium-maintainer

BitKeeper/etc/RESYNC_TREE

BitKeeper/etc/config

BitKeeper/etc/csets

BitKeeper/etc/csets-in
@@ -295,6 +296,7 @@ libmysql/*.ds? 
libmysql/*.vcproj

libmysql/conf_to_src

libmysql/debug/libmysql.exp

libmysql/libmysql.ver

libmysql/my_static.h

libmysql/my_time.c

libmysql/mysys_priv.h
@@ -1611,4 +1613,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
BitKeeper/etc/RESYNC_TREE

configure.in

+10 −1
Original line number Diff line number Diff line
@@ -13,7 +13,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=15:0:0

SHARED_LIB_MAJOR_VERSION=15

SHARED_LIB_VERSION=$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
@@ -60,6 +61,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)
@@ -339,6 +341,13 @@ fi 


MYSQL_PROG_AR



# 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 variation of Linux

libmysql/Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,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
@@ -2817,7 +2817,7 @@ my_bool STDCALL mysql_stmt_attr_get(MYSQL_STMT *stmt, 
{

  switch (attr_type) {

  case STMT_ATTR_UPDATE_MAX_LENGTH:

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

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

    break;

  case STMT_ATTR_CURSOR_TYPE:

    *(ulong*) value= stmt->flags;

libmysql/libmysql.ver.in

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