Commit 43a2257d authored by unknown's avatar unknown
Browse files

Manual merge of 5.1.5 build changes into the general tree. 


sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  Manual merge (one of the changes was incomplete).
parents 0d0d68ab 633d3592

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -6171,7 +6171,7 @@ char const *Write_rows_log_event::do_prepare_row(THD *thd, TABLE *table, 
  */

  DBUG_ASSERT(table->s->fields >= m_width);

  DBUG_ASSERT(ptr);

  ptr= unpack_row(table, table->record[0], ptr, &m_cols);

  ptr= unpack_row(table, (char*)table->record[0], ptr, &m_cols);

  return ptr;

}

sql/log_event.h

+1 −1
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ class Rows_log_event : public Log_event 
  /* Special constants representing sets of flags */

  enum 

  {

      NO_FLAGS = 0U

      RLE_NO_FLAGS = 0U

  };



  virtual ~Rows_log_event();