Commit 8d1230c6 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
extra/yassl/include/openssl/rsa.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/include/yassl_types.hpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/taocrypt/include/integer.hpp:
  Auto merged
extra/yassl/taocrypt/include/misc.hpp:
  Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
  Auto merged
extra/yassl/taocrypt/src/template_instnt.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Manual merge
extra/yassl/src/handshake.cpp:
  Manual merge
extra/yassl/src/yassl_int.cpp:
  Manual merge
extra/yassl/taocrypt/include/runtime.hpp:
  Manual merge
extra/yassl/taocrypt/src/integer.cpp:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/r/trigger.result:
  Manual merge
mysql-test/t/trigger.test:
  Manual merge
parents 66b56724 1bdc15e1

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -1278,3 +1278,6 @@ include/openssl 
mysql-test/r/bdb.log

mysql-test/r/im_client_port.log

mysql-test/r/udf.log

extra/yassl/taocrypt/benchmark/benchmark

extra/yassl/taocrypt/test/test

extra/yassl/testsuite/testsuite

client/mysql.cc

+2 −3
Original line number Diff line number Diff line
@@ -3228,10 +3228,9 @@ com_status(String *buffer __attribute__((unused)), 
      mysql_free_result(result);

    } 

#ifdef HAVE_OPENSSL

    if (mysql.net.vio && mysql.net.vio->ssl_arg &&

	SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg))

    if ((status= mysql_get_ssl_cipher(&mysql)))

      tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",

		  SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg));

		  status);

    else

#endif /* HAVE_OPENSSL */

      tee_puts("SSL:\t\t\tNot in use", stdout);

config/ac-macros/yassl.m4

+4 −1
Original line number Diff line number Diff line 
AC_CONFIG_FILES(extra/yassl/Makefile dnl

extra/yassl/taocrypt/Makefile dnl

extra/yassl/taocrypt/src/Makefile dnl

extra/yassl/src/Makefile)

extra/yassl/src/Makefile dnl

extra/yassl/testsuite/Makefile dnl

extra/yassl/taocrypt/test/Makefile dnl

extra/yassl/taocrypt/benchmark/Makefile)



AC_DEFUN([MYSQL_CHECK_YASSL], [

  AC_MSG_CHECKING(for yaSSL)

configure.in

+9 −1
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ then 
else

  AC_PATH_PROG(AS, as, as)

fi



# Still need ranlib for readline; local static use only so no libtool.

AC_PROG_RANLIB

# We use libtool
@@ -229,6 +230,13 @@ AC_PROG_LIBTOOL 
LIBTOOL="$LIBTOOL --preserve-dup-deps"

AC_SUBST(LIBTOOL)dnl



AC_SUBST(NM)dnl



# NM= "$NM -X64"

#archive_expsym_cmds= `echo "$archive_expsym_cmds" | sed -e '/"$(CC)"//'`

#archive_expsym_cmds= "$CC -q64 $archive_expsym_cmds"

#  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`



#AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL AC_DISABLE_FAST_INSTALL AC_DISABLE_SHARED AC_DISABLE_STATIC



# AC_PROG_INSTALL
@@ -513,7 +521,7 @@ then 
  AC_MSG_ERROR([MySQL requires an ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])

fi



NOINST_LDFLAGS=

NOINST_LDFLAGS="-static"



static_nss=""

STATIC_NSS_FLAGS=""

extra/yassl/Makefile.am

+1 −1
Original line number Diff line number Diff line 
SUBDIRS = taocrypt src

SUBDIRS = taocrypt src testsuite

EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp)