Commit b40b7953 authored by unknown's avatar unknown
Browse files

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

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


include/my_sys.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
parents 9fb5b6d3 55e9c051

BUILD/SETUP.sh

+5 −2
Original line number Diff line number Diff line
@@ -82,8 +82,11 @@ path=`dirname $0` 
export AM_MAKEFLAGS

AM_MAKEFLAGS="-j 4"



# SSL library to use.

SSL_LIBRARY=--with-yassl

# SSL library to use.--with-ssl will select our bundled yaSSL

# implementation of SSL. To use openSSl you will nee too point out

# the location of openSSL headers and lbs on your system.

# Ex --with-ssl=/usr

SSL_LIBRARY=--with-ssl



if [ "x$warning_mode" != "xpedantic" ]; then

# Both C and C++ warnings

BUILD/compile-dist

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ fi 
  --with-federated-storage-engine \

  --with-berkeley-db \

  --with-innodb \

  --with-yassl \

  --with-ssl \

  --enable-thread-safe-client \

  --with-extra-charsets=complex \

  --with-ndbcluster \

BUILD/compile-pentium-debug-openssl

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ path=`dirname $0` 
extra_flags="$pentium_cflags $debug_cflags"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs  --with-debug=full --with-openssl"

extra_configs="$extra_configs  --with-debug=full --with-ssl=/usr"



. "$path/FINISH.sh"

BUILD/compile-pentium-debug-yassl

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ path=`dirname $0` 
extra_flags="$pentium_cflags $debug_cflags"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs  --with-debug=full --with-yassl"

extra_configs="$extra_configs  --with-debug=full --with-ssl"



. "$path/FINISH.sh"

config/ac-macros/openssl.m4

deleted100644 → 0
+0 −136
Original line number Diff line number Diff line 
AC_DEFUN([MYSQL_FIND_OPENSSL], [

  incs="$1"

  libs="$2"

  eval shrexts=\"$shrext_cmds\"

  case "$incs---$libs" in

    ---)

      for d in /usr/ssl/include /usr/local/ssl/include /usr/include \

/usr/include/ssl /opt/ssl/include /opt/openssl/include \

/usr/local/ssl/include /usr/local/include /usr/freeware/include ; do

       if test -f $d/openssl/ssl.h  ; then

         OPENSSL_INCLUDE=-I$d

       fi

      done



      for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \

/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \

/usr/freeware/lib32 /usr/local/lib/ ; do

      # Just to be safe, we test for ".so" anyway

      if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrext ; then

        OPENSSL_LIB=$d

      fi

      done

      ;;

    ---* | *---)

      AC_MSG_ERROR([if either 'includes' or 'libs' is specified, both must be specified])

      ;;

    * )

      if test -f $incs/openssl/ssl.h  ; then

        OPENSSL_INCLUDE=-I$incs

      fi

      # Just to be safe, we test for ".so" anyway

      if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl$shrext ; then

        OPENSSL_LIB=$libs

      fi

      ;;

  esac



  # On RedHat 9 we need kerberos to compile openssl

  for d in /usr/kerberos/include

  do

   if test -f $d/krb5.h  ; then

     OPENSSL_KERBEROS_INCLUDE="$d"

   fi

  done





 if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then

   echo "Could not find an installation of OpenSSL"

   if test -n "$OPENSSL_LIB" ; then

    if test "$TARGET_LINUX" = "true"; then

      echo "Looks like you've forgotten to install OpenSSL development RPM"

    fi

   fi

  exit 1

 fi



])



AC_DEFUN([MYSQL_CHECK_OPENSSL], [

AC_MSG_CHECKING(for OpenSSL)

  AC_ARG_WITH([openssl],

              [  --with-openssl[=DIR]    Include the OpenSSL support],

              [openssl="$withval"],

              [openssl=no])



  AC_ARG_WITH([openssl-includes],

              [

  --with-openssl-includes=DIR

                          Find OpenSSL headers in DIR],

              [openssl_includes="$withval"],

              [openssl_includes=""])



  AC_ARG_WITH([openssl-libs],

              [

  --with-openssl-libs=DIR

                          Find OpenSSL libraries in DIR],

              [openssl_libs="$withval"],

              [openssl_libs=""])



  if test "$openssl" != "no"

  then

	if test "$openssl" != "yes"

	then

		if test -z "$openssl_includes" 

		then

			openssl_includes="$openssl/include"

		fi

		if test -z "$openssl_libs" 

		then

			openssl_libs="$openssl/lib"

		fi

	fi

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

    #force VIO use

    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

    # compiler warnings when using gcc 3.x

    openssl_includes=""

    if test "$OPENSSL_INCLUDE" != "-I/usr/include"

    then

	openssl_includes="$OPENSSL_INCLUDE"

    fi

    if test "$OPENSSL_KERBEROS_INCLUDE"

    then

    	openssl_includes="$openssl_includes -I$OPENSSL_KERBEROS_INCLUDE"

    fi

    AC_DEFINE([HAVE_OPENSSL], [1], [OpenSSL])



    # openssl-devel-0.9.6 requires dlopen() and we can't link staticly

    # on many platforms (We should actually test this here, but it's quite

    # hard) to do as we are doing libtool for linking.

    using_static=""

    case "$CLIENT_EXTRA_LDFLAGS $MYSQLD_EXTRA_LDFLAGS" in

	*-all-static*) using_static="yes" ;;

    esac

    if test "$using_static" = "yes"

    then

      echo "You can't use the --all-static link option when using openssl."

      exit 1

    fi

    NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs"

  else

    AC_MSG_RESULT(no)

	if test ! -z "$openssl_includes"

	then

		AC_MSG_ERROR(Can't have --with-openssl-includes without --with-openssl);

	fi

	if test ! -z "$openssl_libs"

	then

		AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl);

	fi

  fi

  AC_SUBST(openssl_libs)

  AC_SUBST(openssl_includes)

])