Commit 830803a2 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel


sql/set_var.cc:
  Auto merged
parents f3efb3dc 2e73a53e

.bzrignore

+6 −1
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ client/mysqltestmanager-pwgen 
client/mysqltestmanagerc

client/mysys_priv.h

client/readline.cpp

client/rpl_constants.h

client/select_test

client/sql_string.cpp

client/ssl_test
@@ -1347,10 +1348,15 @@ mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings 
mysql-test/suite/funcs_1/r/myisam_views.warnings

mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings

mysql-test/suite/funcs_1/r/ndb_views.warnings

mysql-test/suite/partitions/r/dif

mysql-test/suite/partitions/r/diff

mysql-test/suite/partitions/r/partition.result

mysql-test/suite/partitions/r/partition_bit_ndb.warnings

mysql-test/suite/partitions/r/partition_special_innodb.warnings

mysql-test/suite/partitions/r/partition_special_myisam.warnings

mysql-test/suite/partitions/r/partition_t55.out

mysql-test/suite/partitions/r/partition_t55.refout

mysql-test/suite/partitions/t/partition.test

mysql-test/t/index_merge.load

mysql-test/t/tmp.test

mysql-test/var
@@ -2956,4 +2962,3 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj
 
client/rpl_constants.h

CMakeLists.txt

+8 −0
Original line number Diff line number Diff line
@@ -114,6 +114,14 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG 

	       ${CMAKE_CXX_FLAGS_DEBUG})



	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO 

	       ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})

	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO 

	       ${CMAKE_C_FLAGS_RELWITHDEBINFO})



	# generate .map files  

	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")



	# remove support for Exception handling

	STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

config/ac-macros/misc.m4

+24 −0
Original line number Diff line number Diff line
@@ -663,3 +663,27 @@ esac 
AC_SUBST(AR)

AC_SUBST(ARFLAGS)

])



dnl

dnl  Macro to check time_t range: according to C standard

dnl  array index must be greater than 0 => if time_t is signed,

dnl  the code in the macros below won't compile.

dnl



AC_DEFUN([MYSQL_CHECK_TIME_T],[

    AC_MSG_CHECKING(if time_t is unsigned)

    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(

        [[

#include <time.h>

        ]],

        [[

        int array[(((time_t)-1) > 0) ? 1 : -1];

        ]] )

    ], [

    AC_DEFINE([TIME_T_UNSIGNED], 1, [Define to 1 if time_t is unsigned])

    AC_MSG_RESULT(yes)

    ],

    [AC_MSG_RESULT(no)]

    )

])

config/ac-macros/zlib.m4

+12 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ dnl Define zlib paths to point at bundled zlib 


AC_DEFUN([MYSQL_USE_BUNDLED_ZLIB], [

ZLIB_INCLUDES="-I\$(top_srcdir)/zlib"

ZLIB_LIBS="\$(top_builddir)/zlib/libz.la"

ZLIB_LIBS="\$(top_builddir)/zlib/libzlt.la"

dnl Omit -L$pkglibdir as it's always in the list of mysql_config deps.

ZLIB_DEPS="-lz"

zlib_dir="zlib"
@@ -10,16 +10,25 @@ AC_SUBST([zlib_dir]) 
mysql_cv_compress="yes"

])



dnl Auxiliary macro to check for zlib at given path

dnl Auxiliary macro to check for zlib at given path.

dnl We are strict with the server, as "archive" engine

dnl needs zlibCompileFlags(), but for client only we

dnl are less strict, and take the zlib we find.



AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [

save_CPPFLAGS="$CPPFLAGS"

save_LIBS="$LIBS"

CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS"

LIBS="$LIBS $ZLIB_LIBS"

if test X"$with_server" = Xno

then

  zlibsym=zlibVersion

else

  zlibsym=zlibCompileFlags

fi

AC_CACHE_VAL([mysql_cv_compress],

  [AC_TRY_LINK([#include <zlib.h>],

    [return zlibCompileFlags();],

    [return $zlibsym();],

    [mysql_cv_compress="yes"

    AC_MSG_RESULT([ok])],

    [mysql_cv_compress="no"])

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 
# Remember that regexps needs to quote [ and ] since this is run through m4

MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`

MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"`

MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION. | sed -e 's/[[^0-9.]]//g; s/\./  /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'`

MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION | sed -e 's|[[^0-9.]].*$||;s|$|.|' | sed -e 's/[[^0-9.]]//g; s/\./  /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'`



# The port should be constant for a LONG time

MYSQL_TCP_PORT_DEFAULT=3306