bzr push into mysql-5.5 branch (alfranio.correia:3577 to 3578)

[Alfranio Correia]

 3578 Alfranio Correia	2011-10-14
      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.

    modified:
      sql/sql_repl.cc
 3577 Nirbhay Choubey	2011-10-14 [merge]
      Merge of changeset of WL#5945 from mysql-5.1.

    added:
      cmd-line-utils/libedit/chartype.c
      cmd-line-utils/libedit/chartype.h
      cmd-line-utils/libedit/eln.c
      cmd-line-utils/libedit/historyn.c
      cmd-line-utils/libedit/np/wcsdup.c
      cmd-line-utils/libedit/tokenizern.c
    renamed:
      cmd-line-utils/libedit/el_term.h => cmd-line-utils/libedit/el_terminal.h
      cmd-line-utils/libedit/key.c => cmd-line-utils/libedit/keymacro.c
      cmd-line-utils/libedit/key.h => cmd-line-utils/libedit/keymacro.h
      cmd-line-utils/libedit/term.c => cmd-line-utils/libedit/terminal.c
    modified:
      cmd-line-utils/libedit/CMakeLists.txt
      cmd-line-utils/libedit/README
      cmd-line-utils/libedit/chared.c
      cmd-line-utils/libedit/chared.h
      cmd-line-utils/libedit/common.c
      cmd-line-utils/libedit/config.h
      cmd-line-utils/libedit/el.c
      cmd-line-utils/libedit/el.h
      cmd-line-utils/libedit/emacs.c
      cmd-line-utils/libedit/filecomplete.c
      cmd-line-utils/libedit/filecomplete.h
      cmd-line-utils/libedit/hist.c
      cmd-line-utils/libedit/hist.h
      cmd-line-utils/libedit/histedit.h
      cmd-line-utils/libedit/history.c
      cmd-line-utils/libedit/makelist.sh
      cmd-line-utils/libedit/map.c
      cmd-line-utils/libedit/map.h
      cmd-line-utils/libedit/np/strlcat.c
      cmd-line-utils/libedit/np/strlcpy.c
      cmd-line-utils/libedit/np/unvis.c
      cmd-line-utils/libedit/np/vis.c
      cmd-line-utils/libedit/np/vis.h
      cmd-line-utils/libedit/parse.c
      cmd-line-utils/libedit/parse.h
      cmd-line-utils/libedit/prompt.c
      cmd-line-utils/libedit/prompt.h
      cmd-line-utils/libedit/read.c
      cmd-line-utils/libedit/read.h
      cmd-line-utils/libedit/readline.c
      cmd-line-utils/libedit/readline/readline.h
      cmd-line-utils/libedit/refresh.c
      cmd-line-utils/libedit/refresh.h
      cmd-line-utils/libedit/search.c
      cmd-line-utils/libedit/search.h
      cmd-line-utils/libedit/sig.c
      cmd-line-utils/libedit/sig.h
      cmd-line-utils/libedit/sys.h
      cmd-line-utils/libedit/tokenizer.c
      cmd-line-utils/libedit/tty.c
      cmd-line-utils/libedit/tty.h
      cmd-line-utils/libedit/vi.c
      cmd-line-utils/libedit/el_terminal.h
      cmd-line-utils/libedit/keymacro.c
      cmd-line-utils/libedit/keymacro.h
      cmd-line-utils/libedit/terminal.c
=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc	2011-09-30 12:58:02 +0000
+++ b/sql/sql_repl.cc	2011-10-14 13:24:15 +0000
@@ -720,6 +720,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).