Commit 722ffa87 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/my/mysql-5.0


sql/mysqld.cc:
  Auto merged
parents e17a1e0a 05dfca24

BUILD/SETUP.sh

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"



base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-embedded-server"

max_no_es_configs="$max_leave_isam_configs --without-isam"

max_configs="$max_no_es_configs --with-embedded-server"

BUILD/compile-pentium64-valgrind-max

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ cxx_warnings="$cxx_warnings $debug_extra_warnings" 
extra_configs="$pentium_configs $debug_configs"



# We want to test isam when building with valgrind

extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl --with-vio --with-raid --with-ndbcluster"

extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl --with-raid --with-ndbcluster"



. "$path/FINISH.sh"

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ dlenev@build.mysql.com 
dlenev@jabberwock.localdomain

dlenev@mysql.com

ejonore@mc03.ndb.mysql.com

gbichot@quadita2.mysql.com

georg@beethoven.local

georg@beethoven.site

gerberb@ou800.zenez.com
@@ -71,6 +72,7 @@ hf@deer.(none) 
hf@deer.mysql.r18.ru

hf@genie.(none)

igor@hundin.mysql.fi

igor@linux.local

igor@rurik.mysql.com

ingo@mysql.com

jan@hundin.mysql.fi

config/ac-macros/misc.m4

+7 −16
Original line number Diff line number Diff line
@@ -594,22 +594,13 @@ AC_MSG_RESULT($ac_cv_conv_longlong_to_float) 
])



AC_DEFUN([MYSQL_CHECK_VIO], [

  AC_ARG_WITH([vio],

              [  --with-vio              Include the Virtual IO support],

              [vio="$withval"],

              [vio=no])



  if test "$vio" = "yes"

  then

    vio_dir="vio"

    vio_libs="../vio/libvio.la"

    AC_DEFINE(HAVE_VIO, 1)

  else

    vio_dir=""

    vio_libs=""

  fi

  AC_SUBST([vio_dir])

  AC_SUBST([vio_libs])

dnl

dnl we always use vio: no need for special defines 

dnl

  AC_DEFINE([HAVE_VIO_READ_BUFF], [1],

            [Define to enable buffered read. This works only if syscalls

            read/recv return as soon as there is some data in the kernel

            buffer, no matter how big the given buffer is.])

])



# Local version of _AC_PROG_CXX_EXIT_DECLARATION that does not

config/ac-macros/openssl.m4

+0 −3
Original line number Diff line number Diff line
@@ -89,9 +89,6 @@ AC_MSG_CHECKING(for OpenSSL) 
	fi

    MYSQL_FIND_OPENSSL([$openssl_includes], [$openssl_libs])

    #force VIO use

    vio_dir="vio"

    vio_libs="../vio/libvio.la"

    AC_DEFINE([HAVE_VIO], [1], [Virtual IO])

    AC_MSG_RESULT(yes)

    openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto"

    # Don't set openssl_includes to /usr/include as this gives us a lot of