BUG#26878022 MYSQLBINLOG: ASSERTION `(OLD_MH->M_KEY == KEY) ||

             (OLD_MH->M_KEY == 0)' FAILED

Post push fix to ASAN issues.

Author: Joao Gramacho

client/mysqlbinlog.cc

@@ -1460,17 +1460,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
 
       if (head->error == -1)
         goto err;
-      if (opt_remote_proto == BINLOG_LOCAL)
-      {
-        ev->free_temp_buf(); // free memory allocated in dump_local_log_entries
-      }
-      else
-      {
-        /*
-          disassociate but not free dump_remote_log_entries time memory
-        */
-        ev->temp_buf= 0;
-      }
+      ev->free_temp_buf();
       /*
         We don't want this event to be deleted now, so let's hide it (I
         (Guilhem) should later see if this triggers a non-serious Valgrind
@@ -1718,14 +1708,9 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
   retval= ERROR_STOP;
 end:
   rec_count++;
-  /*
-    Destroy the log_event object. If reading from a remote host,
-    set the temp_buf to NULL so that memory isn't freed twice.
-  */
+  /* Destroy the log_event object. */
   if (ev)
   {
-    if (opt_remote_proto != BINLOG_LOCAL)
-      ev->temp_buf= 0;
     if (destroy_evt) /* destroy it later if not set (ignored table map) */
       delete ev;
   }
@@ -2705,6 +2690,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
     if (rewrite_db_filter(&event_buf, &event_len, glob_description_event))
     {
       error("Got a fatal error while applying rewrite db filter.");
+      my_free(event_buf);
       DBUG_RETURN(ERROR_STOP);
     }
 
@@ -2781,6 +2767,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
          */
           old_off= start_position_mot;
           len= 1; // fake Rotate, so don't increment old_off
+          event_len= 0;
         }
       }
       else if (type == binary_log::FORMAT_DESCRIPTION_EVENT)
@@ -2794,7 +2781,10 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
         */
         // fake event when not in raw mode, don't increment old_off
         if ((old_off != BIN_LOG_HEADER_SIZE) && (!raw_mode))
+        {
           len= 1;
+          event_len= 0;
+        }
         if (raw_mode)
         {
           if (result_file && (result_file != stdout))
@@ -2839,13 +2829,16 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
       {
         DBUG_EXECUTE_IF("simulate_result_file_write_error",
                         DBUG_SET("+d,simulate_fwrite_error"););
-        if (my_fwrite(result_file, net->read_pos + 1 , len - 1, MYF(MY_NABP)))
+        if (my_fwrite(result_file, (const uchar*)event_buf, event_len,
+                      MYF(MY_NABP)))
         {
           error("Could not write into log file '%s'", log_file_name);
           retval= ERROR_STOP;
         }
         if (ev)
           reset_temp_buf_and_delete(ev);
+        else
+          my_free(event_buf);
 
         /* Flush result_file after every event */
         fflush(result_file);

mysql-test/suite/binlog/r/binlog_mysqlbinlog_rewrite_db.result

@@ -11,6 +11,7 @@ DELETE FROM t1 WHERE i=2;
 [Syntax error in the use of the new option: The to database name is missing]
 [VALID SYNTAX,The from->to database names is correctly mentioned]
 [VALID SYNTAX read from remote server ,The from->to database names are correctly mentioned]
+[VALID SYNTAX read from remote server in raw mode, the from->to database names are correctly mentioned]
 [VALID SYNTAX, but during the application of rewrite_db filter an invalid event is found. Hence mysqlbinlog tool should exit with an appropriate error]
 [ERROR: Got fatal error while applying rewrite db filter.]
 #Dropping the database db1 and creating the table in the new database new_db1.
@@ -29,6 +30,12 @@ CREATE DATABASE new_db1;
 RESET MASTER;
 [The event of table db1.t1 has been successfully applied to new_db1.t1]
 include/assert.inc [Assert that table new_db1.t1 has one row after applying the sql file.]
+DROP DATABASE db1;
+DROP DATABASE new_db1;
+CREATE DATABASE new_db1;
+RESET MASTER;
+[The event of table db1.t1 has been successfully applied to new_db1.t1 from raw mode]
+include/assert.inc [Assert that table new_db1.t1 has one row after applying the sql file from raw binlog dump.]
 CLEANUP
 DROP DATABASE db1;
 DROP DATABASE new_db1;

mysql-test/suite/binlog/t/binlog_mysqlbinlog_rewrite_db.test

@@ -67,6 +67,11 @@ DELETE FROM t1 WHERE i=2;
 --echo [VALID SYNTAX read from remote server ,The from->to database names are correctly mentioned]
 --exec $MYSQL_BINLOG --force-if-open --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --rewrite-db="db1->new_db1" $binlog_file > $MYSQLTEST_VARDIR/tmp/row_event_from_remote_server_rewrite.sql
 
+# BUG26878022: MYSQLBINLOG: ASSERTION `(OLD_MH->M_KEY == KEY) || (OLD_MH->M_KEY == 0)' FAILED
+--echo [VALID SYNTAX read from remote server in raw mode, the from->to database names are correctly mentioned]
+--exec $MYSQL_BINLOG --raw --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --rewrite-db="db1->new_db1" $binlog_file --result-file=$MYSQLTEST_VARDIR/tmp/
+--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/tmp/$binlog_file > $MYSQLTEST_VARDIR/tmp/row_event_from_remote_server_rewrite_raw.sql
+
 --echo [VALID SYNTAX, but during the application of rewrite_db filter an invalid event is found. Hence mysqlbinlog tool should exit with an appropriate error]
 --echo [ERROR: Got fatal error while applying rewrite db filter.]
 --error 1
@@ -111,11 +116,25 @@ RESET MASTER;
 --let $assert_cond= `SELECT COUNT(*)=1 from new_db1.t1`
 --source include/assert.inc
 
+DROP DATABASE db1;
+DROP DATABASE new_db1;
+CREATE DATABASE new_db1;
+# With gtid-mode=on we need purge gtid_executed, if not transactions
+# replayed through mysqlbinlog will be skipped.
+RESET MASTER;
+--echo [The event of table db1.t1 has been successfully applied to new_db1.t1 from raw mode]
+--exec $MYSQL  --database=new_db1 --local-infile=1 < $MYSQLTEST_VARDIR/tmp/row_event_from_remote_server_rewrite_raw.sql
+--let $assert_text= Assert that table new_db1.t1 has one row after applying the sql file from raw binlog dump.
+--let $assert_cond= `SELECT COUNT(*)=1 from new_db1.t1`
+--source include/assert.inc
+
 --echo CLEANUP
 
 --remove_file $MYSQLTEST_VARDIR/tmp/row_event.sql
 --remove_file $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
 --remove_file $MYSQLTEST_VARDIR/tmp/row_event_from_remote_server_rewrite.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/row_event_from_remote_server_rewrite_raw.sql
 --remove_file $MYSQLTEST_VARDIR/tmp/tmp.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/$binlog_file
 DROP DATABASE db1;
 DROP DATABASE new_db1;