bzr commit into mysql-trunk-merge branch (davi:3254)

[Davi Arnaut]

# At a local mysql-trunk-merge repository of davi

 3254 Davi Arnaut	2010-10-08 [merge]
      Merge of mysql-5.5-bugteam into mysql-trunk-merge.

    modified:
      sql/item.cc
      sql/mysqld.cc
      storage/innobase/include/ibuf0ibuf.h
      storage/innobase/include/row0row.h
      strings/my_vsnprintf.c
=== modified file 'sql/item.cc'
--- a/sql/item.cc	2010-10-07 17:28:58 +0000
+++ b/sql/item.cc	2010-10-08 15:14:24 +0000
@@ -1783,8 +1783,7 @@ bool agg_item_set_converter(DTCollation
     In case we're in statement prepare, create conversion item
     in its memory: it will be reused on each execute.
   */
-  arena= thd->is_stmt_prepare() ? thd->activate_stmt_arena_if_needed(&backup)
-                                : NULL;
+  arena= thd->activate_stmt_arena_if_needed(&backup);
 
   for (i= 0, arg= args; i < nargs; i++, arg+= item_sep)
   {

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-10-08 07:13:53 +0000
+++ b/sql/mysqld.cc	2010-10-08 15:14:24 +0000
@@ -3240,12 +3240,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-07-16 21:00:50 +0000
+++ b/storage/innobase/include/ibuf0ibuf.h	2010-10-08 15:14:24 +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-07-16 21:00:50 +0000
+++ b/storage/innobase/include/row0row.h	2010-10-08 15:14:24 +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]