bk commit into 6.0 tree (cmiller:1.2752)

[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 15:17:34-05:00, cmiller@stripped +2 -0
  Fix build failures on sapsrv1 WRT openssl and size_t .

  include/sha2.h@stripped, 2007-12-07 15:17:31-05:00, cmiller@stripped +4 -0
    openssl may not include sufficient headers to find "size_t", which
    is in stddef.h .

  sql/mysqld.cc@stripped, 2007-12-07 15:17:31-05:00, cmiller@stripped +1 -3
    Always call end_ssl, the same way we always call init_ssl.  There's
    more to SSL than communication.

diff -Nrup a/include/sha2.h b/include/sha2.h
--- a/include/sha2.h	2007-12-07 09:35:25 -05:00
+++ b/include/sha2.h	2007-12-07 15:17:31 -05:00
@@ -18,6 +18,10 @@
 
 #include <my_config.h>
 
+#  ifdef HAVE_STDDEF_H
+#    include <stddef.h>
+#  endif
+
 #  ifndef HAVE_YASSL
 #    include <openssl/sha.h>
 #  endif
diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2007-12-07 11:21:56 -05:00
+++ b/sql/mysqld.cc	2007-12-07 15:17:31 -05:00
@@ -744,8 +744,8 @@ static void close_server_sock();
 static void clean_up_mutexes(void);
 static void wait_for_signal_thread_to_end(void);
 static void create_pid_file();
-static void end_ssl();
 #endif
+static void end_ssl();
 
 
 #ifndef EMBEDDED_LIBRARY
@@ -1259,9 +1259,7 @@ void clean_up(bool print_message)
 #endif
   delete binlog_filter;
   delete rpl_filter;
-#ifndef EMBEDDED_LIBRARY
   end_ssl();
-#endif
   vio_end();
 #ifdef USE_REGEX
   my_regex_end();