bzr push into mysql-trunk branch (tor.didriksen:3846 to 3847) Bug#13880759

[Tor Didriksen]

 3847 Tor Didriksen	2012-03-23
      Bug#13880759 BUILD IS BROKEN WHEN -DWITH_SSL=SYSTEM
      
      When compiled as part of libmysql, 
      the #defines for HAVE_YASSL and HAVE_OPENSSL were broken.
      
      Fixed by not including my_global.h in md5.cc
      (it does not need it, so it should not be included)
     @ include/my_md5.h
        Replace the C_MODE_START and C_MODE_END macros.

    modified:
      include/my_md5.h
      sql/md5.cc
 3846 Tor Didriksen	2012-03-23
      Fix broken build on Mac (with MYSQL_MAINTAINER_MODE)
      sql_view.cc: In function ‘bool mysql_make_view(THD*, File_parser*, TABLE_LIST*, uint)’:
      sql_view.cc:1107: warning: ‘resultiew.cc:1106: warning: ‘parse_status’ may be used uninitialized in this function
      sql_view.cc:1102: warning: ‘view_select’ may be used uninitialized in this function

    modified:
      sql/sql_view.cc
=== modified file 'include/my_md5.h'
--- a/include/my_md5.h	2012-03-06 14:29:42 +0000
+++ b/include/my_md5.h	2012-03-23 14:32:09 +0000
@@ -29,11 +29,16 @@
 
 #if defined(HAVE_YASSL)
 
-C_MODE_START
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 void my_md5_hash(char *digest, const char *buf, int len);
 
-C_MODE_END
+#ifdef __cplusplus
+}
+#endif
+
 
 #else /* HAVE_YASSL */
 
@@ -65,7 +70,9 @@ typedef struct {
   unsigned char in[64];
 } my_MD5Context;
 
-C_MODE_START
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 void my_MD5Init (my_MD5Context *context);
 void my_MD5Update (my_MD5Context *context,
@@ -73,7 +80,10 @@ void my_MD5Update (my_MD5Context *contex
 void my_MD5Final (unsigned char digest[16],
                   my_MD5Context *context);
 
-C_MODE_END
+#ifdef __cplusplus
+}
+#endif
+
 
 #define MY_MD5_HASH(digest,buf,len) \
 do { \
@@ -85,10 +95,14 @@ do { \
 
 #endif /* defined(HAVE_YASSL) || defined(HAVE_OPENSSL) */
 
-C_MODE_START
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 void compute_md5_hash(char *digest, const char *buf, int len);
 
-C_MODE_END
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* MY_MD5_INCLUDED */

=== modified file 'sql/md5.cc'
--- a/sql/md5.cc	2012-02-17 10:30:31 +0000
+++ b/sql/md5.cc	2012-03-23 14:32:09 +0000
@@ -23,7 +23,6 @@
   to make available YaSSL's MD5 implementation.
 */
 
-#include <my_global.h>
 #include <my_md5.h>
 
 #ifdef HAVE_YASSL

No bundle (reason: useless for push emails).