bzr commit into mysql-5.1-bugteam branch (staale.smedseng:3348) Bug#43414

[Staale Smedseng]

#At file:///export/home/tmp/ss156133/z/43414-51/ based on revid:azundris@stripped

 3348 Staale Smedseng	2010-02-22
      Bug #43414 Parenthesis (and other) warnings compiling 
      MySQL with gcc 4.3.2
            
      This is the final patch in the context of this bug. 
     @ cmd-line-utils/readline/rlmbutil.h
        Changed in a previous patch, reverted by a backport.
     @ cmd-line-utils/readline/text.c
        Static var initialization.
     @ extra/yassl/include/yassl_error.hpp
        SetErrorString handles errors outside of the YasslError
        enum.
     @ extra/yassl/src/ssl.cpp
        SetErrorString handles errors outside of the YasslError
        enum.
     @ extra/yassl/src/yassl_error.cpp
        SetErrorString handles errors outside of the YasslError
        enum.

    modified:
      cmd-line-utils/readline/rlmbutil.h
      cmd-line-utils/readline/text.c
      extra/yassl/include/yassl_error.hpp
      extra/yassl/src/ssl.cpp
      extra/yassl/src/yassl_error.cpp
      sql/log_event.cc
      sql/log_event_old.cc
      sql/sql_update.cc
=== modified file 'cmd-line-utils/readline/rlmbutil.h'
--- a/cmd-line-utils/readline/rlmbutil.h	2007-11-19 13:38:08 +0000
+++ b/cmd-line-utils/readline/rlmbutil.h	2010-02-22 13:23:47 +0000
@@ -109,8 +109,8 @@ extern int _rl_is_mbchar_matched PARAMS(
 extern wchar_t _rl_char_value PARAMS((char *, int));
 extern int _rl_walphabetic PARAMS((wchar_t));
 
-#define _rl_to_wupper(wc)	(iswlower (wc) ? towupper (wc) : (wc))
-#define _rl_to_wlower(wc)	(iswupper (wc) ? towlower (wc) : (wc))
+#define _rl_to_wupper(wc)	(iswlower (wc) ? (wchar_t)towupper (wc) : (wc))
+#define _rl_to_wlower(wc)	(iswupper (wc) ? (wchar_t)towlower (wc) : (wc))
 
 #define MB_NEXTCHAR(b,s,c,f) \
 	((MB_CUR_MAX > 1 && rl_byte_oriented == 0) \

=== modified file 'cmd-line-utils/readline/text.c'
--- a/cmd-line-utils/readline/text.c	2009-06-29 13:17:01 +0000
+++ b/cmd-line-utils/readline/text.c	2010-02-22 13:23:47 +0000
@@ -614,7 +614,7 @@ rl_arrow_keys (count, c)
 #ifdef HANDLE_MULTIBYTE
 static char pending_bytes[MB_LEN_MAX];
 static int pending_bytes_length = 0;
-static mbstate_t ps = {0};
+static mbstate_t ps;
 #endif
 
 /* Insert the character C at the current location, moving point forward.

=== modified file 'extra/yassl/include/yassl_error.hpp'
--- a/extra/yassl/include/yassl_error.hpp	2007-01-29 15:54:40 +0000
+++ b/extra/yassl/include/yassl_error.hpp	2010-02-22 13:23:47 +0000
@@ -64,7 +64,7 @@ enum YasslError {
 enum Library { yaSSL_Lib = 0, CryptoLib, SocketLib };
 enum { MAX_ERROR_SZ = 80 };
 
-void SetErrorString(YasslError, char*);
+void SetErrorString(unsigned long, char*);
 
 /* remove for now, if go back to exceptions use this wrapper
 // Base class for all yaSSL exceptions

=== modified file 'extra/yassl/src/ssl.cpp'
--- a/extra/yassl/src/ssl.cpp	2009-02-13 16:41:47 +0000
+++ b/extra/yassl/src/ssl.cpp	2010-02-22 13:23:47 +0000
@@ -991,7 +991,7 @@ char* ERR_error_string(unsigned long err
   static char* msg = (char*)"Please supply a buffer for error string";
 
     if (buffer) {
-        SetErrorString(YasslError(errNumber), buffer);
+        SetErrorString(errNumber, buffer);
         return buffer;
     }
 

=== modified file 'extra/yassl/src/yassl_error.cpp'
--- a/extra/yassl/src/yassl_error.cpp	2008-11-18 16:45:44 +0000
+++ b/extra/yassl/src/yassl_error.cpp	2010-02-22 13:23:47 +0000
@@ -55,7 +55,7 @@ Library Error::get_lib() const
 */
 
 
-void SetErrorString(YasslError error, char* buffer)
+void SetErrorString(unsigned long error, char* buffer)
 {
     using namespace TaoCrypt;
     const int max = MAX_ERROR_SZ;  // shorthand

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-02-05 17:48:01 +0000
+++ b/sql/log_event.cc	2010-02-22 13:23:47 +0000
@@ -8753,7 +8753,7 @@ static bool record_compare(TABLE *table)
   DBUG_DUMP("record[1]", table->record[1], table->s->reclength);
 
   bool result= FALSE;
-  uchar saved_x[2], saved_filler[2];
+  uchar saved_x[2]= {0, 0}, saved_filler[2]= {0, 0};
 
   if (table->s->null_bytes > 0)
   {

=== modified file 'sql/log_event_old.cc'
--- a/sql/log_event_old.cc	2010-01-24 07:03:23 +0000
+++ b/sql/log_event_old.cc	2010-02-22 13:23:47 +0000
@@ -337,7 +337,7 @@ static bool record_compare(TABLE *table)
    */
 
   bool result= FALSE;
-  uchar saved_x[2], saved_filler[2];
+  uchar saved_x[2]= {0, 0}, saved_filler[2]= {0, 0};
 
   if (table->s->null_bytes > 0)
   {

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2010-02-10 14:37:34 +0000
+++ b/sql/sql_update.cc	2010-02-22 13:23:47 +0000
@@ -1283,7 +1283,8 @@ bool mysql_multi_update(THD *thd,
 
   if (using_handler)
   {
-    Internal_error_handler *top_handler= thd->pop_internal_handler();
+    Internal_error_handler *top_handler;
+    top_handler= thd->pop_internal_handler();
     DBUG_ASSERT(&handler == top_handler);
   }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]