cleanup DBUG, DBUG_DUMP_EVENT_BUF

introduce DBUG_DUMP_EVENT_BUF,
remove few unused DBUG_EXECUTE_IF's
simplify few DBUG_PRINT's
remove few redundant #ifndef DBUG_OFF's

1 files changed, 2 insertions, 14 deletions

diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 5601c9c25e9..442258ae8cf 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -2073,18 +2073,6 @@ static int init_binlog_sender(binlog_send_info *info,
       info->dbug_reconnect_counter= 22;
     });
 
-  /*
-    We want to corrupt the first event, in Log_event::read_log_event().
-    But we do not want the corruption to happen early, eg. when client does
-    BINLOG_GTID_POS(). So test case sets a DBUG trigger which causes us to
-    set the real DBUG injection here.
-  */
-  DBUG_EXECUTE_IF("corrupt_read_log_event2_set",
-                  {
-                    DBUG_SET("-d,corrupt_read_log_event2_set");
-                    DBUG_SET("+d,corrupt_read_log_event2");
-                  });
-
   if (global_system_variables.log_warnings > 1)
     sql_print_information(
         "Start binlog_dump to slave_server(%lu), pos(%s, %lu)",
@@ -2798,9 +2786,9 @@ void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos,
       BINLOG_GTID_POS(). So test case sets a DBUG trigger which causes us to
       set the real DBUG injection here.
     */
-    DBUG_EXECUTE_IF("corrupt_read_log_event_to_slave_set",
+    DBUG_EXECUTE_IF("corrupt_read_log_event2_set",
                     {
-                      DBUG_SET("-d,corrupt_read_log_event_to_slave_set");
+                      DBUG_SET("-d,corrupt_read_log_event2_set");
                       DBUG_SET("+d,corrupt_read_log_event2");
                     });