Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1951 05/10/28 11:45:30 msvensson@neptunus.(none) +5 -0
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
extra/yassl/taocrypt/src/Makefile.am
1.8 05/10/28 11:45:19 msvensson@neptunus.(none) +4 -4
Manual merge
sql/Makefile.am
1.112 05/10/28 11:41:27 msvensson@neptunus.(none) +0 -0
Auto merged
libmysqld/Makefile.am
1.64 05/10/28 11:41:27 msvensson@neptunus.(none) +0 -0
Auto merged
configure.in
1.359 05/10/28 11:41:27 msvensson@neptunus.(none) +0 -0
Auto merged
config/ac-macros/yassl.m4
1.8 05/10/28 11:41:27 msvensson@neptunus.(none) +0 -0
Auto merged
# 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: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/mysql-5.0/RESYNC
--- 1.358/configure.in 2005-10-20 13:36:45 +02:00
+++ 1.359/configure.in 2005-10-28 11:41:27 +02:00
@@ -1129,7 +1129,7 @@
sql/Makefile.in)
# Use gen_lex_hash.linux instead of gen_lex_hash
# Add library dependencies to mysqld_DEPENDENCIES
- lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs)"
+ lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs) \$(yassl_libs)"
cat > $filesed << EOF
s,\(^.*\$(MAKE) gen_lex_hash\)\$(EXEEXT),#\1,
s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux,
--- 1.111/sql/Makefile.am 2005-09-29 04:04:46 +02:00
+++ 1.112/sql/Makefile.am 2005-10-28 11:41:27 +02:00
@@ -22,7 +22,8 @@
INCLUDES = @ZLIB_INCLUDES@ \
@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
-I$(top_builddir)/include -I$(top_srcdir)/include \
- -I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes)
+ -I$(top_srcdir)/regex -I$(srcdir) $(yassl_includes) \
+ $(openssl_includes)
WRAPLIBS= @WRAPLIBS@
SUBDIRS = share
libexec_PROGRAMS = mysqld
@@ -42,7 +43,8 @@
@bdb_libs@ @innodb_libs@ @pstack_libs@ \
@innodb_system_libs@ \
@ndbcluster_libs@ @ndbcluster_system_libs@ \
- $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@
+ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
+ @yassl_libs@ @openssl_libs@
noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
item_strfunc.h item_timefunc.h item_uniq.h \
item_create.h item_subselect.h item_row.h \
--- 1.63/libmysqld/Makefile.am 2005-09-29 04:04:46 +02:00
+++ 1.64/libmysqld/Makefile.am 2005-10-28 11:41:27 +02:00
@@ -29,7 +29,7 @@
-I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \
-I$(top_srcdir)/regex \
- $(openssl_includes) @ZLIB_INCLUDES@
+ $(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
noinst_LIBRARIES = libmysqld_int.a
pkglib_LIBRARIES = libmysqld.a
@@ -80,7 +80,9 @@
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
$(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/vio/libvio.a
+ $(top_builddir)/vio/libvio.a \
+ @yassl_libs_with_path@
+
#
# To make it easy for the end user to use the embedded library we
--- 1.7/config/ac-macros/yassl.m4 2005-10-12 10:17:29 +02:00
+++ 1.8/config/ac-macros/yassl.m4 2005-10-28 11:41:27 +02:00
@@ -15,10 +15,9 @@
fi
AC_MSG_RESULT([using bundled yaSSL])
yassl_dir="extra/yassl"
- openssl_libs="\
- -L\$(top_builddir)/extra/yassl/src -lyassl\
- -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt"
- openssl_includes="-I\$(top_srcdir)/extra/yassl/include"
+ 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.])
# System specific checks
@@ -36,8 +35,9 @@
yassl_dir=""
AC_MSG_RESULT(no)
fi
- AC_SUBST(openssl_libs)
- AC_SUBST(openssl_includes)
+ 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" ])
])
--- 1.7/extra/yassl/taocrypt/src/Makefile.am 2005-09-15 08:59:25 +02:00
+++ 1.8/extra/yassl/taocrypt/src/Makefile.am 2005-10-28 11:45:19 +02:00
@@ -1,12 +1,12 @@
INCLUDES = -I../include -I../../mySTL
-noinst_LTLIBRARIES = libtaocrypt.la libtaoint.la
-libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
+noinst_LIBRARIES = libtaocrypt.a libtaoint.a
+libtaocrypt_a_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp \
md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \
template_instnt.cpp
-libtaocrypt_la_LIBADD = libtaoint.la
-libtaoint_la_SOURCES = integer.cpp
-libtaoint_la_CXXFLAGS = @yassl_integer_extra_cxxflags@
+libtaocrypt_a_LIBADD = libtaoint.a
+libtaoint_a_SOURCES = integer.cpp
+libtaoint_a_CXXFLAGS = @yassl_integer_extra_cxxflags@
EXTRA_DIST = ../include/*.hpp
AM_CXXFLAGS = -DYASSL_PURE_C
| Thread |
|---|
| • bk commit into 5.0 tree (msvensson:1.1951) | msvensson | 28 Oct |
