bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3187) Bug#58699

[Tor Didriksen]

#At file:///export/home/didrik/repo/5.5-bugteam-bug58137/ based on revid:sergey.glukhov@stripped

 3187 Tor Didriksen	2010-12-13
      Bug #58699 cannot build with gcc dbg on solaris
     @ include/my_pthread.h
        On solaris pthread_once_t contains an array, so we must wrap the initialization in {}
     @ include/mysql/psi/mysql_file.h
        Include my_global.h first, to get correct platform definitions.
     @ mysys/ptr_cmp.c
        Hide the unused static functions in #ifdef's on solaris.
     @ sql/my_decimal.cc
        Include my_global.h first, to get correct platform definitions.
     @ sql/mysqld.cc
        Fix signed/unsigned comparison warning.
     @ sql/sql_audit.h
        Include my_global.h first, to get correct platform definitions.
     @ sql/sql_plugin.h
        Include my_global.h first, to get correct platform definitions.
     @ sql/sql_show.cc
        Fix: warning: cast from pointer to integer of different size
     @ sql/sys_vars.h
        Use reinterpret_cast rather than c-style cast.
     @ storage/perfschema/pfs_instr.cc
        Include my_global.h first, to get correct platform definitions.

    modified:
      include/my_pthread.h
      include/mysql/psi/mysql_file.h
      mysys/ptr_cmp.c
      sql/my_decimal.cc
      sql/mysqld.cc
      sql/sql_audit.h
      sql/sql_plugin.h
      sql/sql_show.cc
      sql/sys_vars.h
      storage/perfschema/pfs_instr.cc
=== modified file 'include/my_pthread.h'
--- a/include/my_pthread.h	2010-10-20 14:48:19 +0000
+++ b/include/my_pthread.h	2010-12-13 16:04:03 +0000
@@ -214,7 +214,11 @@ int pthread_cancel(pthread_t thread);
 typedef void *(* pthread_handler)(void *);
 
 #define my_pthread_once_t pthread_once_t
+#if defined __GNUC__ && defined TARGET_OS_SOLARIS
+#define MY_PTHREAD_ONCE_INIT { PTHREAD_ONCE_INIT }
+#else
 #define MY_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
+#endif
 #define my_pthread_once(C,F) pthread_once(C,F)
 
 /* Test first for RTS or FSU threads */

=== modified file 'include/mysql/psi/mysql_file.h'
--- a/include/mysql/psi/mysql_file.h	2010-07-09 23:00:24 +0000
+++ b/include/mysql/psi/mysql_file.h	2010-12-13 16:04:03 +0000
@@ -16,6 +16,8 @@
 #ifndef MYSQL_FILE_H
 #define MYSQL_FILE_H
 
+#include "my_global.h"
+
 /* For strlen() */
 #include <string.h>
 /* For MY_STAT */

=== modified file 'mysys/ptr_cmp.c'
--- a/mysys/ptr_cmp.c	2009-11-20 19:01:43 +0000
+++ b/mysys/ptr_cmp.c	2010-12-13 16:04:03 +0000
@@ -50,11 +50,15 @@ static int ptr_compare_3(size_t *compare
 
 	/* Get a pointer to a optimal byte-compare function for a given size */
 
+#ifdef TARGET_OS_SOLARIS
 qsort2_cmp get_ptr_compare (size_t size)
 {
-#ifdef TARGET_OS_SOLARIS
+  (void) size;
   return (qsort2_cmp) native_compare;
+}
 #else
+qsort2_cmp get_ptr_compare (size_t size)
+{
   if (size < 4)
     return (qsort2_cmp) ptr_compare;
   switch (size & 3) {
@@ -64,8 +68,8 @@ qsort2_cmp get_ptr_compare (size_t size)
     case 3: return (qsort2_cmp) ptr_compare_3;
     }
   return 0;					/* Impossible */
-#endif /* TARGET_OS_SOLARIS */
 }
+#endif /* TARGET_OS_SOLARIS */
 
 
 	/*
@@ -75,6 +79,8 @@ qsort2_cmp get_ptr_compare (size_t size)
 
 #define cmp(N) if (first[N] != last[N]) return (int) first[N] - (int) last[N]
 
+#ifndef TARGET_OS_SOLARIS
+
 static int ptr_compare(size_t *compare_length, uchar **a, uchar **b)
 {
   reg3 int length= *compare_length;
@@ -177,6 +183,8 @@ static int ptr_compare_3(size_t *compare
   return (0);
 }
 
+#endif /* !TARGET_OS_SOLARIS */
+
 void my_store_ptr(uchar *buff, size_t pack_length, my_off_t pos)
 {
   switch (pack_length) {

=== modified file 'sql/my_decimal.cc'
--- a/sql/my_decimal.cc	2010-07-09 12:28:51 +0000
+++ b/sql/my_decimal.cc	2010-12-13 16:04:03 +0000
@@ -13,6 +13,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include "my_global.h"
 #include "sql_priv.h"
 #include <time.h>
 

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-12-07 17:08:54 +0000
+++ b/sql/mysqld.cc	2010-12-13 16:04:03 +0000
@@ -3257,8 +3257,8 @@ static int init_common_variables()
      size_t *pagesize = (size_t *) malloc(sizeof(size_t) * nelem);
      if (pagesize != NULL && getpagesizes(pagesize, nelem) > 0)
      {
-       size_t i, max_page_size= 0;
-       for (i= 0; i < nelem; i++)
+       size_t max_page_size= 0;
+       for (int i= 0; i < nelem; i++)
        {
          if (pagesize[i] > max_page_size &&
              pagesize[i] <= max_desired_page_size)

=== modified file 'sql/sql_audit.h'
--- a/sql/sql_audit.h	2010-11-18 14:08:32 +0000
+++ b/sql/sql_audit.h	2010-12-13 16:04:03 +0000
@@ -17,6 +17,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+#include "my_global.h"
+
 #include <mysql/plugin_audit.h>
 #include "sql_class.h"
 

=== modified file 'sql/sql_plugin.h'
--- a/sql/sql_plugin.h	2010-12-01 22:15:14 +0000
+++ b/sql/sql_plugin.h	2010-12-13 16:04:03 +0000
@@ -16,6 +16,8 @@
 #ifndef _sql_plugin_h
 #define _sql_plugin_h
 
+#include "my_global.h"
+
 /*
   the following #define adds server-only members to enum_mysql_show_type,
   that is defined in plugin.h

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2010-11-30 17:53:11 +0000
+++ b/sql/sql_show.cc	2010-12-13 16:04:03 +0000
@@ -2246,7 +2246,7 @@ static bool show_status_array(THD *thd, 
           end= int10_to_str(*(long*) value, buff, 10);
           break;
         case SHOW_LONGLONG_STATUS:
-          value= ((char *) status_var + (ulonglong) value);
+          value= ((char *) status_var + (ulong) value);
           /* fall through */
         case SHOW_LONGLONG:
           end= longlong10_to_str(*(longlong*) value, buff, 10);

=== modified file 'sql/sys_vars.h'
--- a/sql/sys_vars.h	2010-10-08 00:53:00 +0000
+++ b/sql/sys_vars.h	2010-12-13 16:04:03 +0000
@@ -1191,7 +1191,8 @@ public:
   void global_save_default(THD *thd, set_var *var)
   {
     LEX_STRING pname;
-    pname.str= *(char**)option.def_value;
+    char **default_value= reinterpret_cast<char**>(option.def_value);
+    pname.str= *default_value;
     pname.length= strlen(pname.str);
 
     plugin_ref plugin;
@@ -1556,7 +1557,10 @@ public:
   void session_save_default(THD *thd, set_var *var)
   { var->save_result.ptr= global_var(void*); }
   void global_save_default(THD *thd, set_var *var)
-  { var->save_result.ptr= *(void**)option.def_value; }
+  {
+    void **default_value= reinterpret_cast<void**>(option.def_value);
+    var->save_result.ptr= *default_value;
+  }
   bool check_update_type(Item_result type)
   { return type != INT_RESULT && type != STRING_RESULT; }
   uchar *session_value_ptr(THD *thd, LEX_STRING *base)

=== modified file 'storage/perfschema/pfs_instr.cc'
--- a/storage/perfschema/pfs_instr.cc	2010-11-11 11:34:46 +0000
+++ b/storage/perfschema/pfs_instr.cc	2010-12-13 16:04:03 +0000
@@ -18,9 +18,9 @@
   Performance schema instruments (implementation).
 */
 
+#include "my_global.h"
 #include <string.h>
 
-#include "my_global.h"
 #include "my_sys.h"
 #include "pfs.h"
 #include "pfs_stat.h"


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