bzr push into mysql-trunk branch (alfranio.correia:3494 to 3495)

[Alfranio Correia]

 3495 Alfranio Correia	2011-10-14 [merge]
      merge 5.5 --> mysql-trunk

    modified:
      sql/rpl_master.cc
 3494 Luis Soares	2011-10-14
      BUG#11747887
      
      Reverting patch, which created a few failures in PB2. Needs some
      extra work.

    removed:
      mysql-test/std_data/bug11747887-bin.000002
      mysql-test/suite/rpl/r/binlog-hexdump.result
      mysql-test/suite/rpl/t/binlog-hexdump.test
    modified:
      sql/log_event.cc
=== modified file 'sql/rpl_master.cc'
--- a/sql/rpl_master.cc	2011-09-30 13:14:37 +0000
+++ b/sql/rpl_master.cc	2011-10-14 13:37:57 +0000
@@ -958,6 +958,19 @@ impossible position";
       else if (event_type == STOP_EVENT)
         binlog_can_be_corrupted= FALSE;
 
+      /*
+        Introduced this code to make the gcc 4.6.1 compiler happy. When
+        warnings are converted to errors, the compiler complains about
+        the fact that binlog_can_be_corrupted is defined but never used.
+
+        We need to check if this is a dead code or if someone removed any
+        code by mistake.
+
+        /Alfranio
+      */
+      if (binlog_can_be_corrupted)
+         sql_print_information("The binlog may be corrupted.");
+
       pos = my_b_tell(&log);
       if (RUN_HOOK(binlog_transmit, before_send_event,
                    (thd, flags, packet, log_file_name, pos)))

No bundle (reason: useless for push emails).