bk commit into 5.0 tree (svoj:1.1936)

[svoj]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1936 05/06/15 01:39:58 svoj@stripped +2 -0
   WL#2286 - Compile MySQL w/YASSL support
      Fix for link failures on boxes with non-gnu compiler.
      Fix for compilation failure on hpux11.

  tools/Makefile.am
    1.21 05/06/15 01:39:53 svoj@stripped +6 -1
    Add a dummy C++ file to mysqltestmanager to make libtool use a C++ linker:
    this lets mysqltestmanager link when using yaSSL and a non-gcc C++ compiler.

  extra/yassl/taocrypt/src/misc.cpp
    1.6 05/06/15 01:39:53 svoj@stripped +1 -1
    Adjust __HP_aCC value to solve compilation problem on hpux11.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	svoj.pils.ru
# Root:	/home/svoj/devel/mysql/yassl-mysql-5.0

--- 1.20/tools/Makefile.am	2005-05-20 01:44:00 +05:00
+++ 1.21/tools/Makefile.am	2005-06-15 01:39:53 +05:00
@@ -15,13 +15,18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 # Process this file with automake to create Makefile.in
 
+if HAVE_YASSL
+  yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp
+else
+  yassl_dummy_link_fix=
+endif
 INCLUDES=-I$(top_srcdir)/include $(openssl_includes) \
 	-I$(top_builddir)/include
 LDADD=  @CLIENT_EXTRA_LDFLAGS@ \
         $(top_builddir)/libmysql_r/libmysqlclient_r.la \
         @openssl_libs@ @ZLIB_LIBS@ 
 bin_PROGRAMS=		mysqltestmanager
-mysqltestmanager_SOURCES=	mysqlmanager.c
+mysqltestmanager_SOURCES=	mysqlmanager.c $(yassl_dummy_link_fix)
 mysqltestmanager_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
 DEF=			-DUNDEF_THREADS_HACK
 

--- 1.5/extra/yassl/taocrypt/src/misc.cpp	2005-06-10 20:09:36 +05:00
+++ 1.6/extra/yassl/taocrypt/src/misc.cpp	2005-06-15 01:39:53 +05:00
@@ -136,7 +136,7 @@
 
 
 #if !(defined(_MSC_VER) && (_MSC_VER < 1300)) && \
-    !(defined(__HP_aCC) && (__HP_aCC <= 35700))
+    !(defined(__HP_aCC) && (__HP_aCC <= 36300))
 using std::new_handler;
 using std::set_new_handler;
 #endif