From: Jon Olav Hauglid
Date: October 3 2012 1:13pm
Subject: bzr push into mysql-trunk branch (jon.hauglid:4618 to 4619)
List-Archive: http://lists.mysql.com/commits/144933
Message-Id: <20121003131321.13923.76207.4619@atum08.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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

    modified:
      sql/ha_partition.cc
 4618 magnus.blaudd@stripped	2012-10-03 [merge]
      Merge 5.6 -> trunk

    modified:
      sql/abstract_query_plan.cc
=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2012-10-03 11:12:54 +0000
+++ b/sql/ha_partition.cc	2012-10-03 13:09:01 +0000
@@ -5052,7 +5052,7 @@ int ha_partition::common_index_read(ucha
     m_start_key.length= key_len= calculate_key_len(table, active_index, 
                                                    m_start_key.key,
                                                    m_start_key.keypart_map);
-    DBUG_PRINT("info", ("have_start_key map %u find_flag %u len %u",
+    DBUG_PRINT("info", ("have_start_key map %lu find_flag %u len %u",
                         m_start_key.keypart_map, m_start_key.flag, key_len));
     DBUG_ASSERT(key_len);
   }

No bundle (reason: useless for push emails).