Commit 467b1e62 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


include/my_global.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_open.c:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
parents 46cec2c3 84da27f6

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1268,3 +1268,4 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

libmysqld/ha_blackhole.cc

client/mysqltest.c

+23 −17
Original line number Diff line number Diff line
@@ -3313,6 +3313,8 @@ static int handle_error(const char *query, struct st_query *q, 
         (q->expected_errno[i].code.errnum == err_errno)) ||

        ((q->expected_errno[i].type == ERR_SQLSTATE) &&

         (strcmp(q->expected_errno[i].code.sqlstate, err_sqlstate) == 0)))

    {

      if (!disable_result_log)

      {

        if (q->expected_errors == 1)

        {
@@ -3328,6 +3330,7 @@ static int handle_error(const char *query, struct st_query *q, 
                 (q->expected_errno[0].type == ERR_ERRNO &&

                  q->expected_errno[0].code.errnum != 0))

          dynstr_append(ds,"Got one of the listed errors\n");

      }

      /* OK */

      DBUG_RETURN(0);

    }
@@ -3335,11 +3338,14 @@ static int handle_error(const char *query, struct st_query *q, 


  DBUG_PRINT("info",("i: %d  expected_errors: %d", i, q->expected_errors));



  if (!disable_result_log)

  {

    dynstr_append_mem(ds, "ERROR ",6);

    replace_dynstr_append(ds, err_sqlstate);

    dynstr_append_mem(ds, ": ", 2);

    replace_dynstr_append(ds, err_error);

    dynstr_append_mem(ds, "\n", 1);

  }



  if (i)

  {

config/ac-macros/yassl.m4

+4 −6
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    AC_MSG_RESULT([using bundled yaSSL])

    yassl_dir="extra/yassl"

    yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"

    yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.a \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.a"

    yassl_includes="-I\$(top_srcdir)/extra/yassl/include"

    AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])

    AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
@@ -24,12 +23,12 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    yassl_integer_extra_cxxflags=""

    case $host_cpu--$CXX_VERSION in

        sparc*--*Sun*C++*5.6*)

	# Disable inlining when compiling taocrypt/src/integer.cpp

	yassl_integer_extra_cxxflags="+d"

        AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/integer.cpp])

	# Disable inlining when compiling taocrypt/src/

	yassl_taocrypt_extra_cxxflags="+d"

        AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/])

        ;;

    esac

    AC_SUBST([yassl_integer_extra_cxxflags])

    AC_SUBST([yassl_taocrypt_extra_cxxflags])



  else

    yassl_dir=""
@@ -38,6 +37,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
  AC_SUBST(yassl_libs)

  AC_SUBST(yassl_includes)

  AC_SUBST(yassl_dir)

  AC_SUBST(yassl_libs_with_path)

  AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])

])

extra/innochecksum.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#define _LARGEFILE_SOURCE

#define _LARGEFILE64_SOURCE



#define _XOPEN_SOURCE /* needed to include getopt.h on some platforms. */



#include <stdio.h>

#include <stdlib.h>

#include <time.h>

extra/yassl/src/Makefile.am

+2 −2
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../taocrypt/include -I../mySTL



noinst_LIBRARIES = libyassl.a

libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \

noinst_LTLIBRARIES = libyassl.la

libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \

	handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \

	template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp

EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)