Don't overwrite the global format description event when we encounter a FDE in innodb binlog

Author: tarunw07

client/mysqlbinlog.cc

@@ -1940,13 +1940,15 @@ static void generate_output_legacy_binlog_name(char *out_name, size_t out_name_l
 }
 
 static bool init_output_legacy_binlog(FILE **out_file, char *out_name,
-                                      size_t out_name_len)
+                                      size_t out_name_len,
+                                      Format_description_log_event *fdev)
 {
   /* Reset the log_file_pos to 0 for the new output legacy binlog file */
   log_file_pos= 0;
   log_file_pos_overflow_warning_printed= false;
 
-  generate_output_legacy_binlog_name(out_name, out_name_len, ++convert_engine_output_index);
+  generate_output_legacy_binlog_name(out_name, out_name_len,
+                                     ++convert_engine_output_index);
 
   if (!(*out_file= my_fopen(out_name, O_WRONLY | O_BINARY, MYF(MY_WME))))
   {
@@ -1966,8 +1968,7 @@ static bool init_output_legacy_binlog(FILE **out_file, char *out_name,
   log_file_pos+= BIN_LOG_HEADER_SIZE;
 
   // Write the FORMAT_DESCRIPTION_EVENT to the output legacy binlog file
-  if (write_format_description_event_to_legacy_binlog(*out_file,
-                                                      glob_description_event))
+  if (write_format_description_event_to_legacy_binlog(*out_file, fdev))
   {
     error("Could not write FORMAT_DESCRIPTION_EVENT to output legacy binlog "
           "file");
@@ -1999,7 +2000,8 @@ static bool init_output_legacy_binlog(FILE **out_file, char *out_name,
 }
 
 static bool rotate_output_legacy_binlog(FILE **out_file, char *out_name,
-                                        size_t out_name_len)
+                                        size_t out_name_len,
+                                        Format_description_log_event *fdev)
 {
   char next_out_file_name[FN_REFLEN + 1];
   generate_output_legacy_binlog_name(next_out_file_name,
@@ -2019,7 +2021,7 @@ static bool rotate_output_legacy_binlog(FILE **out_file, char *out_name,
     return true;
   }
 
-  return init_output_legacy_binlog(out_file, out_name, out_name_len);
+  return init_output_legacy_binlog(out_file, out_name, out_name_len, fdev);
 }
 
 /*
@@ -2029,28 +2031,31 @@ static bool rotate_output_legacy_binlog(FILE **out_file, char *out_name,
 */
 static Exit_status write_event_to_legacy_binlog(Log_event *ev)
 {
-  /* 
+  /*
       Update the global server_id and timestamp variables
   */
   generated_event_server_id= ev->server_id;
   generated_event_timestamp= (uint32) ev->when;
 
-  // if event type is FORMAT_DESCRIPTION_EVENT, store the event in global
-  // variable glob_description_event
+  /*
+    A FORMAT_DESCRIPTION_EVENT in an engine binlog indicates a server restart.
+    Use this FDE only for the restart-triggered rotation. Do not store it in
+    glob_description_event, as reusing it for normal rotations would
+    incorrectly clear the temporary tables.
+  */
   if (ev->get_type_code() == FORMAT_DESCRIPTION_EVENT)
   {
 
-    delete glob_description_event;
-    glob_description_event= (Format_description_log_event *) ev;
-
     // close the output legacy binlog file if it is open
     if (output_legacy_binlog_file)
     {
       if (rotate_output_legacy_binlog(&output_legacy_binlog_file,
-                                      out_file_name, sizeof(out_file_name)))
+                                      out_file_name, sizeof(out_file_name),
+                                      (Format_description_log_event *) ev))
         goto err;
     }
 
+    delete ev;
     return OK_CONTINUE;
   }
 
@@ -2062,18 +2067,19 @@ static Exit_status write_event_to_legacy_binlog(Log_event *ev)
   if (!output_legacy_binlog_file)
   {
     if (init_output_legacy_binlog(&output_legacy_binlog_file, out_file_name,
-                                  sizeof(out_file_name)))
+                                  sizeof(out_file_name),
+                                  glob_description_event))
       goto err;
   }
 
   /*
     Rotate the output legacy binlog file once the max binlog size is reached.
   */
-  if (ev->get_type_code() == GTID_EVENT &&
-      log_file_pos >= opt_max_binlog_size)
+  if (ev->get_type_code() == GTID_EVENT && log_file_pos >= opt_max_binlog_size)
   {
     if (rotate_output_legacy_binlog(&output_legacy_binlog_file, out_file_name,
-                                    sizeof(out_file_name)))
+                                    sizeof(out_file_name),
+                                    glob_description_event))
       goto err;
   }
 

mysql-test/suite/binlog_in_engine/mysqlbinlog_convert_engine_binlog_max_size.result

@@ -1,10 +1,14 @@
 include/reset_master.inc
 CREATE TABLE t1 (a INT PRIMARY KEY, b LONGTEXT) ENGINE=InnoDB;
+# restart
 INSERT INTO t1 VALUES (1, REPEAT('a', 48 * 1024));
 INSERT INTO t1 VALUES (2, REPEAT('b', 48 * 1024));
 INSERT INTO t1 VALUES (3, REPEAT('c', 48 * 1024));
 FLUSH BINARY LOGS;
 *** Convert with a 32K maximum output binlog size
+*** Only the restart FDE is marked as created at startup
+FOUND 1 /Start: binlog v 4.*at startup/ in max_size_restart_fde.txt
+NOT FOUND /Start: binlog v 4.*at startup/ in max_size_normal_fdes.txt
 *** Rotated files form a replayable binlog sequence
 DROP TABLE t1;
 SELECT a, LENGTH(b) FROM t1 ORDER BY a;

mysql-test/suite/binlog_in_engine/mysqlbinlog_convert_engine_binlog_max_size.test

@@ -5,8 +5,11 @@
 
 --source include/reset_master.inc
 
-
 CREATE TABLE t1 (a INT PRIMARY KEY, b LONGTEXT) ENGINE=InnoDB;
+
+# Generate a FORMAT_DESCRIPTION_EVENT that marks a server restart.
+--source include/restart_mysqld.inc
+
 INSERT INTO t1 VALUES (1, REPEAT('a', 48 * 1024));
 INSERT INTO t1 VALUES (2, REPEAT('b', 48 * 1024));
 INSERT INTO t1 VALUES (3, REPEAT('c', 48 * 1024));
@@ -20,21 +23,37 @@ FLUSH BINARY LOGS;
 --echo *** Convert with a 32K maximum output binlog size
 --exec $MYSQL_BINLOG --convert-engine-binlog --max-binlog-size=32768 --result-file=$MYSQL_TMP_DIR/max_size_conv $datadir/binlog-000000.ibb
 
-# Rotation is checked at transaction boundaries. The first large INSERT stays
-# in the initial file; each following INSERT starts a new output file.
+# The restart rotates the initial file after CREATE TABLE. Size is checked at
+# transaction boundaries, so each large INSERT after the first causes the next
+# INSERT to start a new output file.
 --file_exists $MYSQL_TMP_DIR/max_size_conv.000001
 --file_exists $MYSQL_TMP_DIR/max_size_conv.000002
 --file_exists $MYSQL_TMP_DIR/max_size_conv.000003
+--file_exists $MYSQL_TMP_DIR/max_size_conv.000004
+
+--echo *** Only the restart FDE is marked as created at startup
+--exec $MYSQL_BINLOG --verbose $MYSQL_TMP_DIR/max_size_conv.000002 > $MYSQL_TMP_DIR/max_size_restart_fde.txt
+--let SEARCH_FILE= $MYSQL_TMP_DIR/max_size_restart_fde.txt
+--let SEARCH_PATTERN= Start: binlog v 4.*at startup
+--source include/search_pattern_in_file.inc
+
+--exec $MYSQL_BINLOG --verbose $MYSQL_TMP_DIR/max_size_conv.000001 $MYSQL_TMP_DIR/max_size_conv.000003 $MYSQL_TMP_DIR/max_size_conv.000004 > $MYSQL_TMP_DIR/max_size_normal_fdes.txt
+--let SEARCH_FILE= $MYSQL_TMP_DIR/max_size_normal_fdes.txt
+--let SEARCH_PATTERN= Start: binlog v 4.*at startup
+--source include/search_pattern_in_file.inc
 
 --echo *** Rotated files form a replayable binlog sequence
---exec $MYSQL_BINLOG --gtid-strict-mode=0 $MYSQL_TMP_DIR/max_size_conv.000001 $MYSQL_TMP_DIR/max_size_conv.000002 $MYSQL_TMP_DIR/max_size_conv.000003 > $MYSQLTEST_VARDIR/tmp/max_size_replay.sql
+--exec $MYSQL_BINLOG --gtid-strict-mode=0 $MYSQL_TMP_DIR/max_size_conv.000001 $MYSQL_TMP_DIR/max_size_conv.000002 $MYSQL_TMP_DIR/max_size_conv.000003 $MYSQL_TMP_DIR/max_size_conv.000004 > $MYSQLTEST_VARDIR/tmp/max_size_replay.sql
 DROP TABLE t1;
 --exec $MYSQL --abort-source-on-error -e "source $MYSQLTEST_VARDIR/tmp/max_size_replay.sql;" test
 --remove_file $MYSQLTEST_VARDIR/tmp/max_size_replay.sql
 
 SELECT a, LENGTH(b) FROM t1 ORDER BY a;
 
+--remove_file $MYSQL_TMP_DIR/max_size_restart_fde.txt
+--remove_file $MYSQL_TMP_DIR/max_size_normal_fdes.txt
 --remove_file $MYSQL_TMP_DIR/max_size_conv.000001
 --remove_file $MYSQL_TMP_DIR/max_size_conv.000002
 --remove_file $MYSQL_TMP_DIR/max_size_conv.000003
+--remove_file $MYSQL_TMP_DIR/max_size_conv.000004
 DROP TABLE t1;