1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
This commit is contained in:
unknown 2005-06-15 22:43:44 +05:00
commit fc465d1497
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/yassl/taocrypt/src/misc.cpp
View File

@ -136,7 +136,7 @@ unsigned long Crop(unsigned long value, unsigned int size)
#if !(defined(_MSC_VER) && (_MSC_VER < 1300)) && \ #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::new_handler;
using std::set_new_handler; using std::set_new_handler;
#endif #endif

7
tools/Makefile.am
View File

@ -15,13 +15,18 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Process this file with automake to create Makefile.in # 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) \ INCLUDES=-I$(top_srcdir)/include $(openssl_includes) \
-I$(top_builddir)/include -I$(top_builddir)/include
LDADD= @CLIENT_EXTRA_LDFLAGS@ \ LDADD= @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/libmysql_r/libmysqlclient_r.la \ $(top_builddir)/libmysql_r/libmysqlclient_r.la \
@openssl_libs@ @ZLIB_LIBS@ @openssl_libs@ @ZLIB_LIBS@
bin_PROGRAMS= mysqltestmanager bin_PROGRAMS= mysqltestmanager
mysqltestmanager_SOURCES= mysqlmanager.c mysqltestmanager_SOURCES= mysqlmanager.c $(yassl_dummy_link_fix)
mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
DEF= -DUNDEF_THREADS_HACK DEF= -DUNDEF_THREADS_HACK