Removed Rows_log_event::m_master_reclength as it is not used

The usage of the variable was removed in 2007

Other things (minor cleanups):
- Replaced variable 'f' with 'field' to get code more readable
- Removed not needed variable unpack_result
- Removed DBUG_OFF in middle of the code and replaced with attribute()
- Replaced 'auto' variable with real type (readability)

Author: montywi

sql/log_event.h

@@ -4840,8 +4840,6 @@ class Rows_log_event : public Log_event
   */
   MY_BITMAP   m_cols_ai;
 
-  ulong       m_master_reclength; /* Length of record on master side */
-
   /* Bit buffers in the same memory as the class */
   my_bitmap_map  m_bitbuf[128/(sizeof(my_bitmap_map)*8)];
   my_bitmap_map  m_bitbuf_ai[128/(sizeof(my_bitmap_map)*8)];
@@ -4935,7 +4933,7 @@ class Rows_log_event : public Log_event
 
     ASSERT_OR_RETURN_ERROR(m_curr_row <= m_rows_end, HA_ERR_CORRUPT_EVENT);
     return ::unpack_row(rgi, m_table, m_width, m_curr_row, cols,
-                        &m_curr_row_end, &m_master_reclength, m_rows_end);
+                        &m_curr_row_end, m_rows_end);
   }
 
   // Unpack the current row into m_table->record[0]
@@ -4945,7 +4943,7 @@ class Rows_log_event : public Log_event
 
     ASSERT_OR_RETURN_ERROR(m_curr_row <= m_rows_end, HA_ERR_CORRUPT_EVENT);
     return ::unpack_row(rgi, m_table, m_width, m_curr_row, &m_cols,
-                        &m_curr_row_end, &m_master_reclength, m_rows_end);
+                        &m_curr_row_end, m_rows_end);
   }
   bool process_triggers(trg_event_type event, trg_action_time_type time_type,
                         bool old_row_is_record1, bool *skip_row_indicator);

sql/log_event_server.cc

@@ -7450,7 +7450,7 @@ int Rows_log_event::find_key(const rpl_group_info *rgi)
       const uchar *curr_row_end= m_curr_row_end;
       Check_level_instant_set clis(m_table->in_use, CHECK_FIELD_IGNORE);
       if (int err= unpack_row(rgi, m_table, m_width, m_curr_row, &m_cols,
-                              &curr_row_end, &m_master_reclength, m_rows_end))
+                              &curr_row_end, m_rows_end))
         DBUG_RETURN(err);
     }
 

sql/rpl_record.cc

@@ -322,9 +322,6 @@ static void convert_field(Field *f, Field *result_field, Field *conv_field)
    @param curr_row_end
                   Pointer to variable that will hold the value of the
                   one-after-end position for the current row
-   @param master_reclength
-                  Pointer to variable that will be set to the length of the
-                  record on the master side
    @param row_end
                   Pointer to variable that will hold the value of the
                   end position for the data in the row event
@@ -340,7 +337,7 @@ static void convert_field(Field *f, Field *result_field, Field *conv_field)
 int unpack_row(const rpl_group_info *rgi, TABLE *table, uint const colcnt,
                uchar const *const row_data, MY_BITMAP const *cols,
                uchar const **const current_row_end,
-               ulong *const master_reclength, uchar const *const row_end)
+               uchar const *const row_end)
 {
   int error;
   DBUG_ENTER("unpack_row");
@@ -357,7 +354,6 @@ int unpack_row(const rpl_group_info *rgi, TABLE *table, uint const colcnt,
        nothing to unpack.
      */
     *current_row_end= st.pack_ptr;
-    *master_reclength= 0;
     DBUG_RETURN(0);
   }
 
@@ -380,12 +376,12 @@ int unpack_row(const rpl_group_info *rgi, TABLE *table, uint const colcnt,
         pointer is NULL, no conversions are necessary.
        */
       Field *conv_field= conv_table ? conv_table->field[i] : NULL;
-      Field *const f= conv_field ? conv_field : result_field;
+      Field *const field= conv_field ? conv_field : result_field;
+      DBUG_ASSERT(field != NULL);
 
       DBUG_PRINT("debug", ("Conversion %srequired for field '%s' (#%u)",
                            conv_field ? "" : "not ",
                            result_field->field_name.str, i));
-      DBUG_ASSERT(f != NULL);
 
       /*
         No need to bother about columns that does not exist: they have
@@ -396,13 +392,12 @@ int unpack_row(const rpl_group_info *rgi, TABLE *table, uint const colcnt,
 
       result_field->set_has_explicit_value();
 
-      bool unpack_result= unpack_field(tabledef, f, &st, i);
-      if (!unpack_result)
+      if (!unpack_field(tabledef, field, &st, i))
       {
         rgi->rli->report(ERROR_LEVEL, ER_SLAVE_CORRUPT_EVENT,
                     rgi->gtid_info(),
                     "Could not read field '%s' of table '%s.%s'",
-                    f->field_name.str, table->s->db.str,
+                    field->field_name.str, table->s->db.str,
                     table->s->table_name.str);
         DBUG_RETURN(HA_ERR_CORRUPT_EVENT);
       }
@@ -417,7 +412,7 @@ int unpack_row(const rpl_group_info *rgi, TABLE *table, uint const colcnt,
         and will use copy_fields set up in copy_data_between_tables
        */
       if (conv_field)
-        convert_field(f, result_field, conv_field);
+        convert_field(field, result_field, conv_field);
     }
 
     /*
@@ -440,14 +435,6 @@ int unpack_row(const rpl_group_info *rgi, TABLE *table, uint const colcnt,
         st.null_mask <<= 1;
       }
     }
-
-    if (master_reclength)
-    {
-      if (result_field)
-        *master_reclength = (ulong)(result_field->ptr - table->record[0]);
-      else
-        *master_reclength = table->s->reclength;
-    }
   }
   else
   {
@@ -461,21 +448,17 @@ int unpack_row(const rpl_group_info *rgi, TABLE *table, uint const colcnt,
     {
       DBUG_ASSERT(bitmap_is_set(cols, i));
       Field *f= conv_table->field[i];
-#ifndef DBUG_OFF
-      bool result=
-#endif
-        unpack_field(tabledef, f, &st, i);
+      bool result __attribute__((unused));
+      result= unpack_field(tabledef, f, &st, i);
       DBUG_ASSERT(result);
     }
 
-    for (const auto *copy=rpl_data.copy_fields;
+    for (const Copy_field *copy= rpl_data.copy_fields;
          copy != rpl_data.copy_fields_end; copy++)
     {
       copy->to_field->set_has_explicit_value();
       copy->do_copy(copy);
     }
-    if (master_reclength)
-      *master_reclength = conv_table->s->reclength;
   } // if (rpl_data.is_online_alter())
 
   /*

sql/rpl_record.h

@@ -32,7 +32,7 @@ size_t pack_row(TABLE* table, MY_BITMAP const* cols,
 int unpack_row(const rpl_group_info *rgi,
                TABLE *table, uint const colcnt,
                uchar const *const row_data, MY_BITMAP const *cols,
-               uchar const **const curr_row_end, ulong *const master_reclength,
+               uchar const **const curr_row_end,
                uchar const *const row_end);
 
 // Fill table's record[0] with default values.