bk commit into 6.0 tree (cmiller:1.2753)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
6.0 repository of cmiller. When cmiller 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@stripped, 2007-12-07 22:57:35-05:00, cmiller@stripped +4 -0
  Further fix-ups for various platforms, and correct unfriendly idea
  in YaSSL code.

  extra/yassl/include/yassl_types.hpp@stripped, 2007-12-07 22:57:32-05:00, cmiller@stripped +2 -4
    Undo terrible, intrusive idea in exported header.

  extra/yassl/taocrypt/include/misc.hpp@stripped, 2007-12-07 22:57:32-05:00, cmiller@stripped +2 -4
    Undo terrible, intrusive idea in exported header.

  include/sha2.h@stripped, 2007-12-07 22:57:32-05:00, cmiller@stripped +5 -3
    Make SHA2 code only read headers if a SSL library is asserted to 
    exist.

  sql/item_strfunc.cc@stripped, 2007-12-07 22:57:32-05:00, cmiller@stripped +1 -2
    Reorder headers to be more sane.

diff -Nrup a/extra/yassl/include/yassl_types.hpp b/extra/yassl/include/yassl_types.hpp
--- a/extra/yassl/include/yassl_types.hpp	2006-10-18 19:36:53 -04:00
+++ b/extra/yassl/include/yassl_types.hpp	2007-12-07 22:57:32 -05:00
@@ -138,15 +138,13 @@ typedef unsigned int uint;
 #endif
 
 
-#ifdef min
-    #undef min
-#endif 
-
+#ifndef min
 template <typename T>
 T min(T a, T b)
 {
     return a < b ? a : b;
 }
+#endif
 
 
  
diff -Nrup a/extra/yassl/taocrypt/include/misc.hpp b/extra/yassl/taocrypt/include/misc.hpp
--- a/extra/yassl/taocrypt/include/misc.hpp	2007-03-20 17:43:58 -04:00
+++ b/extra/yassl/taocrypt/include/misc.hpp	2007-12-07 22:57:32 -05:00
@@ -437,14 +437,12 @@ template<> inline word32 rotrFixed(word3
 
 #endif // INTEL_INTRINSICS
 
-#ifdef min
-#undef min
-#endif 
-
+#ifndef min
 inline word32 min(word32 a, word32 b)
 {
     return a < b ? a : b;
 }
+#endif
 
 
 inline word32 ByteReverse(word32 value)
diff -Nrup a/include/sha2.h b/include/sha2.h
--- a/include/sha2.h	2007-12-07 15:17:31 -05:00
+++ b/include/sha2.h	2007-12-07 22:57:32 -05:00
@@ -16,7 +16,9 @@
 #ifndef included_sha2_h
 #define included_sha2_h
 
-#include <my_config.h>
+#include <my_global.h>
+
+#if defined(HAVE_YASSL) || defined(HAVE_OPENSSL)
 
 #  ifdef HAVE_STDDEF_H
 #    include <stddef.h>
@@ -24,9 +26,8 @@
 
 #  ifndef HAVE_YASSL
 #    include <openssl/sha.h>
-#  endif
 
-#  ifdef HAVE_YASSL
+#  else
 
 #include "../extra/yassl/taocrypt/include/sha.hpp"
 
@@ -67,4 +68,5 @@ GEN_YASSL_SHA2_BRIDGE(224);
 
 #  endif /* HAVE_YASSL */
 
+#endif /* HAVE_OPENSSL || HAVE_YASSL */
 #endif /* included_sha2_h */
diff -Nrup a/sql/item_strfunc.cc b/sql/item_strfunc.cc
--- a/sql/item_strfunc.cc	2007-12-07 11:21:56 -05:00
+++ b/sql/item_strfunc.cc	2007-12-07 22:57:32 -05:00
@@ -23,13 +23,12 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
-/* May include caustic 3rd-party defs. Use early, so it can override nothing. */
-#include "sha2.h"
 
 #include "mysql_priv.h"
 #include <m_ctype.h>
 #include "my_md5.h"
 #include "sha1.h"
+#include "sha2.h"
 #include "my_aes.h"
 #include <zlib.h>
 C_MODE_START