bzr push into mysql-5.5-bugteam branch (davi:3226 to 3227) Bug#45288

[Davi Arnaut]

 3227 Davi Arnaut	2010-10-08
      Bug#45288: pb2 returns a lot of compilation warnings on linux
      
      Fix assorted compiler warnings.
     @ sql/mysqld.cc
        Do not declare max_page_size twice. If large pages support
        is enabled, the code expects the size in max_desired_page_size.
     @ storage/innobase/include/ibuf0ibuf.h
        Remove trailing comma. Only present in C99.
        
        Approved by: Vasil (via IRC)
     @ storage/innobase/include/row0row.h
        Remove trailing comma. Only present in C99.
        
        Approved by: Vasil (via IRC)
     @ strings/my_vsnprintf.c
        No need to assert the obvious.

    modified:
      sql/mysqld.cc
      storage/innobase/include/ibuf0ibuf.h
      storage/innobase/include/row0row.h
      strings/my_vsnprintf.c
 3226 Alexander Barkov	2010-10-08
      The fix for 
       Bug#55744 GROUP_CONCAT + CASE + ucs return garbage
      revealed problems in how character set aggregation
      code works with prepared statements.
      
      This patch fixes (hopefully) the problems.

    modified:
      sql/item.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-10-08 07:12:18 +0000
+++ b/sql/mysqld.cc	2010-10-08 14:52:39 +0000
@@ -3244,12 +3244,11 @@ static int init_common_variables()
     desired page sizes.
   */
    int nelem;
-   int max_desired_page_size;
-   int max_page_size;
+   size_t max_desired_page_size;
    if (opt_super_large_pages)
-     max_page_size= SUPER_LARGE_PAGESIZE;
+     max_desired_page_size= SUPER_LARGE_PAGESIZE;
    else
-     max_page_size= LARGE_PAGESIZE;
+     max_desired_page_size= LARGE_PAGESIZE;
    nelem = getpagesizes(NULL, 0);
    if (nelem > 0)
    {

=== modified file 'storage/innobase/include/ibuf0ibuf.h'
--- a/storage/innobase/include/ibuf0ibuf.h	2010-06-22 15:58:28 +0000
+++ b/storage/innobase/include/ibuf0ibuf.h	2010-10-08 14:52:39 +0000
@@ -43,7 +43,7 @@ typedef enum {
 	IBUF_OP_DELETE = 2,
 
 	/* Number of different operation types. */
-	IBUF_OP_COUNT = 3,
+	IBUF_OP_COUNT = 3
 } ibuf_op_t;
 
 /** Combinations of operations that can be buffered.  Because the enum

=== modified file 'storage/innobase/include/row0row.h'
--- a/storage/innobase/include/row0row.h	2010-06-22 15:58:28 +0000
+++ b/storage/innobase/include/row0row.h	2010-10-08 14:52:39 +0000
@@ -267,7 +267,7 @@ enum row_search_result {
 				secondary index leaf page was not in
 				the buffer pool, and the operation was
 				enqueued in the insert/delete buffer */
-	ROW_NOT_DELETED_REF,	/*!< BTR_DELETE was specified, and
+	ROW_NOT_DELETED_REF	/*!< BTR_DELETE was specified, and
 				row_purge_poss_sec() failed */
 };
 

=== modified file 'strings/my_vsnprintf.c'
--- a/strings/my_vsnprintf.c	2010-09-15 11:33:22 +0000
+++ b/strings/my_vsnprintf.c	2010-10-08 14:52:39 +0000
@@ -513,7 +513,7 @@ start:
     arg_count= max(arg_count, arg_index);
     goto start;
   }
-  DBUG_ASSERT(0);
+
   return 0;
 }
 


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