bzr push into mysql-trunk branch (jon.hauglid:3495 to 3496)

[Jon Olav Hauglid]

 3496 Jon Olav Hauglid	2011-10-14
      This patch fixes a compiler error reported by gcc 4.6.1.
        pfs_instr.cc:1476:47: error: cast to pointer from
        integer of different size

    modified:
      storage/perfschema/pfs_instr.cc
 3495 Alfranio Correia	2011-10-14 [merge]
      merge 5.5 --> mysql-trunk

    modified:
      sql/rpl_master.cc
=== modified file 'storage/perfschema/pfs_instr.cc'
--- a/storage/perfschema/pfs_instr.cc	2011-10-05 13:16:38 +0000
+++ b/storage/perfschema/pfs_instr.cc	2011-10-14 14:45:15 +0000
@@ -1473,7 +1473,8 @@ PFS_socket* create_socket(PFS_socket_cla
     */
   my_socket fd= likely(identity != NULL) ?
                 *(reinterpret_cast<const my_socket*>(identity)) : 0;
-  uint random= randomized_index((const void *)fd, socket_max);
+  my_ptrdiff_t ptr= fd;
+  uint random= randomized_index((const void *)ptr, socket_max);
 
   for (scan.init(random, socket_max);
        scan.has_pass();

No bundle (reason: useless for push emails).