List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:October 3 2012 1:13pm
Subject:bzr push into mysql-5.6 branch (jon.hauglid:4383 to 4384)
View as plain text  
 4384 Jon Olav Hauglid	2012-10-03 [merge]
      Merge from mysql-5.5 to mysql-5.6
      No conflicts

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

    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).
Thread
bzr push into mysql-5.6 branch (jon.hauglid:4383 to 4384) Jon Olav Hauglid3 Oct