bzr push into mysql-trunk branch (marc.alff:4405 to 4406)

[Marc Alff]

 4406 Marc Alff	2012-08-31 [merge]
      Merge mysql-5.6 --> mysql-trunk

    modified:
      storage/perfschema/pfs.cc
 4405 kevin.lewis@stripped	2012-08-31 [merge]
      Merge 14571373 from mysql-5.6

    modified:
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/i_s.cc
=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2012-08-20 10:28:54 +0000
+++ b/storage/perfschema/pfs.cc	2012-08-31 21:54:56 +0000
@@ -3958,7 +3958,8 @@ static void end_file_open_wait_and_bind_
       file_handle_array[index]= pfs_file;
     else
     {
-      release_file(pfs_file);
+      if (pfs_file != NULL)
+        release_file(pfs_file);
       file_handle_lost++;
     }
   }

No bundle (reason: useless for push emails).