bzr push into mysql-5.6 branch (marc.alff:4125 to 4126)

[Marc Alff]

 4126 Marc Alff	2012-08-20
      Fixed build warning: unused variable

    modified:
      storage/perfschema/pfs.cc
 4125 Marc Alff	2012-08-20 [merge]
      Local merge

    modified:
      sql/rpl_info_factory.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2012-08-20 09:41:04 +0000
+++ b/storage/perfschema/pfs.cc	2012-08-20 10:22:12 +0000
@@ -3885,9 +3885,6 @@ static void start_file_open_wait_v1(PSI_
                                     const char *src_file,
                                     uint src_line)
 {
-  PSI_file_locker_state *state= reinterpret_cast<PSI_file_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
-
   start_file_wait_v1(locker, 0, src_file, src_line);
 
   return;

No bundle (reason: useless for push emails).