Commit b6317e3a authored by unknown's avatar unknown
Browse files

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

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


configure.in:
  Auto merged
parents 63604387 cba5abe6

config/ac-macros/misc.m4

+17 −0
Original line number Diff line number Diff line
@@ -693,3 +693,20 @@ dnl --------------------------------------------------------------------------- 
dnl END OF MYSQL_CHECK_BIG_TABLES SECTION

dnl ---------------------------------------------------------------------------



dnl MYSQL_NEEDS_MYSYS_NEW

AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW],

[AC_CACHE_CHECK([needs mysys_new helpers], mysql_use_mysys_new,

[

AC_LANG_PUSH(C++)

AC_TRY_LINK([], [

class A { public: int b; }; A *a=new A; a->b=10; delete a;

], mysql_use_mysys_new=no, mysql_use_mysys_new=yes)

AC_LANG_POP(C++)

])

if test "$mysql_use_mysys_new" = "yes"

then

  AC_DEFINE([USE_MYSYS_NEW], [1], [Needs to use mysys_new helpers])

fi

])

configure.in

+1 −26
Original line number Diff line number Diff line
@@ -355,32 +355,6 @@ AC_SUBST(LD) 
AC_SUBST(INSTALL_SCRIPT)



export CC CXX CFLAGS LD LDFLAGS AR

if test "$GXX" = "yes"

then

  # mysqld requires -fno-implicit-templates.

  # Disable exceptions as they seams to create problems with gcc and threads.

  # mysqld doesn't use run-time-type-checking, so we disable it.

  CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"



  CXX_VERNO=`echo $CXX_VERSION | sed -e 's/[[^0-9. ]]//g; s/^ *//g; s/ .*//g'`

  case "$CXX_VERNO" in

    3.*)

      USE_MYSYS_NEW="-DUSE_MYSYS_NEW" # yassl needs it

      if echo $CXX | grep gcc > /dev/null 2>&1

      then

        # If you are using 'gcc' 3.0 (not g++) to compile C++ programs on Linux,

        # we will gets some problems when linking static programs.

        # The following code is used to fix this problem.

        CXXFLAGS="$CXXFLAGS $USE_MYSYS_NEW"

        AC_MSG_WARN([Using MYSYS_NEW for static linking with gcc])

      fi

    ;;

    *)

      USE_MYSYS_NEW=""

    ;;

  esac

  AC_SUBST(USE_MYSYS_NEW)

fi



# Avoid bug in fcntl on some versions of linux

AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")
@@ -1749,6 +1723,7 @@ AC_TYPE_OFF_T 
AC_STRUCT_ST_RDEV

AC_HEADER_TIME

AC_STRUCT_TM

MYSQL_NEEDS_MYSYS_NEW

# AC_CHECK_SIZEOF return 0 when it does not find the size of a

# type. We want a error instead.

AC_CHECK_SIZEOF(char, 1)

extra/yassl/src/Makefile.am

+0 −1
Original line number Diff line number Diff line
@@ -5,4 +5,3 @@ libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ 
	handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \

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

EXTRA_DIST = ../include/*.hpp ../include/openssl/*.h
 
AM_CXXFLAGS=@USE_MYSYS_NEW@

extra/yassl/src/yassl_imp.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2092,6 +2092,7 @@ void InitClientKeyFactory(ClientKeyFactory& ckf) 
} // namespace



#ifdef __GNUC__

namespace mySTL {

template class mySTL::list<unsigned char*>;

template yaSSL::del_ptr_zero mySTL::for_each(mySTL::list<unsigned char*>::iterator, mySTL::list<unsigned char*>::iterator, yaSSL::del_ptr_zero);

template mySTL::pair<int, yaSSL::Message* (*)()>* mySTL::uninit_copy<mySTL::pair<int, yaSSL::Message* (*)()>*, mySTL::pair<int, yaSSL::Message* (*)()>*>(mySTL::pair<int, yaSSL::Message* (*)()>*, mySTL::pair<int, yaSSL::Message* (*)()>*, mySTL::pair<int, yaSSL::Message* (*)()>*);
@@ -2112,5 +2113,6 @@ template yaSSL::del_ptr_zero mySTL::for_each<mySTL::list<yaSSL::SSL_SESSION*>::i 
template yaSSL::del_ptr_zero mySTL::for_each<mySTL::list<yaSSL::input_buffer*>::iterator, yaSSL::del_ptr_zero>(mySTL::list<yaSSL::input_buffer*>::iterator, mySTL::list<yaSSL::input_buffer*>::iterator, yaSSL::del_ptr_zero);

template yaSSL::del_ptr_zero mySTL::for_each<mySTL::list<yaSSL::output_buffer*>::iterator, yaSSL::del_ptr_zero>(mySTL::list<yaSSL::output_buffer*>::iterator, mySTL::list<yaSSL::output_buffer*>::iterator, yaSSL::del_ptr_zero);

template yaSSL::del_ptr_zero mySTL::for_each<mySTL::list<yaSSL::x509*>::iterator, yaSSL::del_ptr_zero>(mySTL::list<yaSSL::x509*>::iterator, mySTL::list<yaSSL::x509*>::iterator, yaSSL::del_ptr_zero);

}

#endif

extra/yassl/src/yassl_int.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1967,7 +1967,9 @@ X509_NAME* X509::GetSubject() 
} // namespace



#ifdef __GNUC__

namespace mySTL {

template yaSSL::yassl_int_cpp_local1::SumData mySTL::for_each<mySTL::list<yaSSL::input_buffer*>::iterator, yaSSL::yassl_int_cpp_local1::SumData>(mySTL::list<yaSSL::input_buffer*>::iterator, mySTL::list<yaSSL::input_buffer*>::iterator, yaSSL::yassl_int_cpp_local1::SumData);

template yaSSL::yassl_int_cpp_local1::SumBuffer mySTL::for_each<mySTL::list<yaSSL::output_buffer*>::iterator, yaSSL::yassl_int_cpp_local1::SumBuffer>(mySTL::list<yaSSL::output_buffer*>::iterator, mySTL::list<yaSSL::output_buffer*>::iterator, yaSSL::yassl_int_cpp_local1::SumBuffer);

template mySTL::list<yaSSL::SSL_SESSION*>::iterator mySTL::find_if<mySTL::list<yaSSL::SSL_SESSION*>::iterator, yaSSL::yassl_int_cpp_local2::sess_match>(mySTL::list<yaSSL::SSL_SESSION*>::iterator, mySTL::list<yaSSL::SSL_SESSION*>::iterator, yaSSL::yassl_int_cpp_local2::sess_match);

}

#endif