Commit 6c304582 authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


configure.in:
  Auto merged
parents 9cd28273 c2108b08

config/ac-macros/yassl.m4

+3 −6
Original line number Diff line number Diff line
@@ -5,12 +5,9 @@ extra/yassl/src/Makefile) 


AC_DEFUN([MYSQL_CHECK_YASSL], [

  AC_MSG_CHECKING(for yaSSL)

  AC_ARG_WITH([yassl],

              [  --with-yassl          Include the yaSSL support],

              [yassl=yes],

              [yassl=no])

  AC_ARG_WITH([yassl], [  --with-yassl          Include the yaSSL support],,)



  if test "$yassl" = "yes"

  if test "$with_yassl" = "yes"

  then

    if test "$openssl" != "no"

    then
@@ -30,5 +27,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
  AC_SUBST(openssl_libs)

  AC_SUBST(openssl_includes)

  AC_SUBST(yassl_dir)

  AM_CONDITIONAL([HAVE_YASSL], [ test "$yassl" = "yes" ])

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

])

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ AC_PROG_MAKE_SET 
# Hack for OS X/Darwin and Metrowerks CodeWarrior

AC_ARG_WITH(darwin-mwcc,

[  --with-darwin-mwcc      Use Metrowerks CodeWarrior wrappers on OS X/Darwin],[

 if [ "with_darwin_mwcc" = yes ] ; then

  builddir=`pwd`

  ccwrapper="$builddir/support-files/MacOSX/mwcc-wrapper"

  arwrapper="$builddir/support-files/MacOSX/mwar-wrapper"
@@ -141,7 +142,7 @@ AC_ARG_WITH(darwin-mwcc, 
  export CC CXX LD AR RANLIB

  AC_SUBST(AR)

  AC_SUBST(RANLIB)

  with_darwin_mwcc=yes

 fi

])



AM_CONDITIONAL(DARWIN_MWCC, test x$with_darwin_mwcc = xyes)

sql/log_event.h

+4 −0
Original line number Diff line number Diff line
@@ -393,6 +393,10 @@ struct sql_ex_info 
#define OPTIONS_WRITTEN_TO_BIN_LOG (OPTION_AUTO_IS_NULL | \

OPTION_NO_FOREIGN_KEY_CHECKS | OPTION_RELAXED_UNIQUE_CHECKS)



#if OPTIONS_WRITTEN_TO_BIN_LOG != ((1L << 14) | (1L << 26) | (1L << 27))

#error OPTIONS_WRITTEN_TO_BIN_LOG must NOT change their values!

#endif



enum Log_event_type

{

  /*