bzr push into mysql-trunk branch (mattias.jonsson:3199 to 3200)

[Mattias Jonsson]

 3200 Mattias Jonsson	2011-06-14 [merge]
      merge

    modified:
      sql/partition_info.cc
 3199 Marko Mäkelä	2011-06-14 [merge]
      Null merge mysql-5.5 to mysql-trunk.

=== modified file 'sql/partition_info.cc'
--- a/sql/partition_info.cc	2011-05-26 15:20:09 +0000
+++ b/sql/partition_info.cc	2011-06-14 09:50:33 +0000
@@ -115,11 +115,11 @@ bool partition_info::prune_partition_bit
   do
   {
     String *part_name_str= partition_names_it++;
-    const char *part_name= part_name_str->c_ptr_safe();
+    const char *part_name= part_name_str->c_ptr();
     PART_NAME_DEF *part_def;
     part_def= (PART_NAME_DEF*) my_hash_search(part_name_hash,
                                               (const uchar*) part_name,
-                                              strlen(part_name));
+                                              part_name_str->length());
     if (!part_def)
     {
       my_error(ER_NO_SUCH_PARTITION, MYF(0), part_name);

No bundle (reason: useless for push emails).