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/in...urce-tree.html

ChangeSet
1.1953 05/06/03 00:28:18 svoj (AT) mysql (DOT) com +3 -0
WL#2286 - Compile MySQL w/YASSL support
Compilation errors fixes.

extra/yassl/taocrypt/src/template_instnt.cpp
1.2 05/06/03 00:28:14 svoj (AT) mysql (DOT) com +10 -4
Instantiate more templates (needed by some 64bit boxes).
Move tcArrayDelete to TaoCrypt namespace (more portable).

extra/yassl/taocrypt/src/integer.cpp
1.8 05/06/03 00:28:14 svoj (AT) mysql (DOT) com +2 -0
Instantiate more templates (needed by some 64bit boxes).

config/ac-macros/yassl.m4
1.2 05/06/03 00:28:14 svoj (AT) mysql (DOT) com +2 -2
Switch to -l/-L instead of passing file name directly. (more portable for ".a" archives)

# 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.1/config/ac-macros/yassl.m4 2005-04-28 18:23:01 +05:00
+++ 1.2/config/ac-macros/yassl.m4 2005-06-03 00:28:14 +05:00
@@ -19,8 +19,8 @@
AC_MSG_RESULT([using bundled yaSSL])
yassl_dir="extra/yassl"
openssl_libs="\
- \$(top_builddir)/extra/yassl/src/libyassl.a\
- \$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.a"
+ -L\$(top_builddir)/extra/yassl/src -lyassl\
+ -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt"
openssl_includes="-I\$(top_srcdir)/extra/yassl/include"
AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
else

--- 1.7/extra/yassl/taocrypt/src/integer.cpp 2005-05-31 20:56:26 +05:00
+++ 1.8/extra/yassl/taocrypt/src/integer.cpp 2005-06-03 00:28:14 +05:00
@@ -3941,6 +3941,8 @@

#ifdef __GNUC__
template unsigned int DivideThreeWordsByTwo<unsigned int, DWord>(unsigned int*, unsigned int, unsigned int, DWord*);
+template unsigned int DivideThreeWordsByTwo<unsigned int, Word>(unsigned int*, unsigned int, unsigned int, Word*);
+template unsigned long long DivideThreeWordsByTwo<unsigned long long, DWord>(unsigned long long*, unsigned long long, unsigned long long, DWord*);
#endif

} // namespace

--- 1.1/extra/yassl/taocrypt/src/template_instnt.cpp 2005-05-31 20:56:27 +05:00
+++ 1.2/extra/yassl/taocrypt/src/template_instnt.cpp 2005-06-03 00:28:14 +05:00
@@ -11,6 +11,7 @@
#endif
template AllocatorWithCleanup<unsigned char>:ointer StdReallocate<unsigned char, AllocatorWithCleanup<unsigned char> >(AllocatorWithCleanup<unsigned char>&, unsigned char*, AllocatorWithCleanup<unsigned char>::size_type, AllocatorWithCleanup<unsigned char>::size_type, bool);
template AllocatorWithCleanup<unsigned int>:ointer StdReallocate<unsigned int, AllocatorWithCleanup<unsigned int> >(AllocatorWithCleanup<unsigned int>&, unsigned int*, AllocatorWithCleanup<unsigned int>::size_type, AllocatorWithCleanup<unsigned int>::size_type, bool);
+template AllocatorWithCleanup<unsigned long long>:ointer StdReallocate<unsigned long long, AllocatorWithCleanup<unsigned long long> >(AllocatorWithCleanup<unsigned long long>&, unsigned long long*, AllocatorWithCleanup<unsigned long long>::size_type, AllocatorWithCleanup<unsigned long long>::size_type, bool);
template class RSA_Decryptor<RSA_BlockType2>;
template class RSA_Encryptor<RSA_BlockType1>;
template class RSA_Encryptor<RSA_BlockType2>;
@@ -18,14 +19,19 @@

namespace mySTL {
template vector<TaoCrypt::Integer>* uninit_fill_n<vector<TaoCrypt::Integer>*, unsigned int, vector<TaoCrypt::Integer> >(vector<TaoCrypt::Integer>*, unsigned int, vector<TaoCrypt::Integer> const&);
+template vector<TaoCrypt::Integer>* uninit_fill_n<vector<TaoCrypt::Integer>*, unsigned long, vector<TaoCrypt::Integer> >(vector<TaoCrypt::Integer>*, unsigned long, vector<TaoCrypt::Integer> const&);
template void destroy<vector<TaoCrypt::Integer>*>(vector<TaoCryp t::Integer>*, vector<TaoCrypt::Integer>*);
template TaoCrypt::Integer* uninit_copy<TaoCrypt::Integer*, TaoCrypt::Integer*>(TaoCrypt::Integer*, TaoCrypt::Integer*, TaoCrypt::Integer*);
template TaoCrypt::Integer* uninit_fill_n<TaoCrypt::Integer*, unsigned int, TaoCrypt::Integer>(TaoCrypt::Integer*, unsigned int, TaoCrypt::Integer const&);
+template TaoCrypt::Integer* uninit_fill_n<TaoCrypt::Integer*, unsigned long, TaoCrypt::Integer>(TaoCrypt::Integer*, unsigned long, TaoCrypt::Integer const&);
template void destroy<TaoCrypt::Integer*>(TaoCrypt::Integer*, TaoCrypt::Integer*);
}

-template void TaoCrypt::tcDelete<TaoCrypt::HASH>(TaoCrypt::HASH* );
-template void TaoCrypt::tcArrayDelete<unsigned>(unsigned*);
-template void TaoCrypt::tcArrayDelete<unsigned char>(unsigned char*);
-template void TaoCrypt::tcArrayDelete<char>(char*);
+namespace TaoCrypt {
+template void tcDelete<HASH>(HASH*);
+template void tcArrayDelete<unsigned>(unsigned*);
+template void tcArrayDelete<unsigned long long>(unsigned long long*);
+template void tcArrayDelete<unsigned char>(unsigned char*);
+template void tcArrayDelete<char>(char*);
+}
#endif

--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw