From: Jon Olav Hauglid
Date: October 12 2012 2:48pm
Subject: bzr push into mysql-trunk branch (jon.hauglid:4713 to 4714)
List-Archive: http://lists.mysql.com/commits/145035
Message-Id: <20121012144822.12904.12587.4714@atum08.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4714 Jon Olav Hauglid	2012-10-12 [merge]
      Merge from mysql-5.6 to mysql-trunk
      No conflicts

    modified:
      sql/item_func.h
      sql/log_event.cc
      sql/sql_cache.cc
 4713 Joerg Bruehe	2012-10-12 [merge]
      Null upmerge of version change

=== modified file 'sql/item_func.h'
--- a/sql/item_func.h	2012-10-10 13:56:28 +0000
+++ b/sql/item_func.h	2012-10-12 14:47:38 +0000
@@ -1686,7 +1686,7 @@ public:
   Item_func_set_user_var(THD *thd, Item_func_set_user_var *item)
     :Item_var_func(thd, item), cached_result_type(item->cached_result_type),
      entry(item->entry), entry_thread_id(item->entry_thread_id),
-     delayed_non_constness(delayed_non_constness), value(item->value),
+     delayed_non_constness(item->delayed_non_constness), value(item->value),
      decimal_buff(item->decimal_buff), null_item(item->null_item),
      save_result(item->save_result), name(item->name)
   {}

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2012-10-10 13:56:28 +0000
+++ b/sql/log_event.cc	2012-10-12 14:47:38 +0000
@@ -13386,7 +13386,7 @@ size_t my_strmov_quoted_identifier_helpe
 
   if (q == EOF)
   {
-    (void *) strncpy(buffer, identifier, id_length);
+    (void) strncpy(buffer, identifier, id_length);
     return id_length;
   }
   quote_char= (char) q;

=== modified file 'sql/sql_cache.cc'
--- a/sql/sql_cache.cc	2012-10-03 12:51:45 +0000
+++ b/sql/sql_cache.cc	2012-10-12 14:04:45 +0000
@@ -1136,7 +1136,7 @@ ulong Query_cache::resize(ulong query_ca
     {
       BLOCK_LOCK_WR(block);
       Query_cache_query *query= block->query();
-      if (query && query->writer())
+      if (query->writer())
       {
         /*
            Drop the writer; this will cancel any attempts to store 
@@ -1146,7 +1146,7 @@ ulong Query_cache::resize(ulong query_ca
         query->writer(0);
         refused++;
       }
-      BLOCK_UNLOCK_WR(block);
+      query->unlock_n_destroy();
       block= block->next;
     } while (block != queries_blocks);
   }

No bundle (reason: useless for push emails).