Commit 0e4fe055 authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.1-release 

into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
parents cf3b2501 eaaf795c

sql/log_event.cc

+2 −2
Original line number Diff line number Diff line
@@ -7129,8 +7129,8 @@ int Update_rows_log_event::do_prepare_row(THD *thd, RELAY_LOG_INFO *rli, 
                    row_start, &m_cols, row_end, &m_master_reclength,

                    table->write_set, UPDATE_ROWS_EVENT);



  DBUG_DUMP("record[0]", table->record[0], table->s->reclength);

  DBUG_DUMP("m_after_image", m_after_image, table->s->reclength);

  DBUG_DUMP("record[0]", (const char *)table->record[0], table->s->reclength);

  DBUG_DUMP("m_after_image", (const char *)m_after_image, table->s->reclength);





  /*

sql/sql_class.cc

+4 −4
Original line number Diff line number Diff line
@@ -2632,10 +2632,10 @@ int THD::binlog_update_row(TABLE* table, bool is_trans, 
  my_size_t const after_size= pack_row(table, cols, after_row, 

                                       after_record);

  

  DBUG_DUMP("before_record", before_record, table->s->reclength);

  DBUG_DUMP("after_record", after_record, table->s->reclength);

  DBUG_DUMP("before_row", before_row, before_size);

  DBUG_DUMP("after_row", after_row, after_size);

  DBUG_DUMP("before_record", (const char *)before_record, table->s->reclength);

  DBUG_DUMP("after_record", (const char *)after_record, table->s->reclength);

  DBUG_DUMP("before_row", (const char *)before_row, before_size);

  DBUG_DUMP("after_row", (const char *)after_row, after_size);



  Rows_log_event* const ev=

    binlog_prepare_pending_rows_event(table, server_id, cols, colcnt,