Commit 408aa56f authored by unknown's avatar unknown
Browse files

Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 

into  mysql_cab.:C:/source/c++/mysql-5.1-BUG_23735
parents 82e8dfd5 b9c97546

client/mysqlbinlog.cc

+15 −0
Original line number Diff line number Diff line
@@ -1360,6 +1360,21 @@ static int dump_local_log_entries(const char* logname) 
  }

  else // reading from stdin;

  {

    /*

      Windows opens stdin in text mode by default. Certain characters

      such as CTRL-Z are interpeted as events and the read() method

      will stop. CTRL-Z is the EOF marker in Windows. to get past this

      you have to open stdin in binary mode. Setmode() is used to set

      stdin in binary mode. Errors on setting this mode result in 

      halting the function and printing an error message to stderr.

    */

#if defined (__WIN__) || (_WIN64)

    if (_setmode(fileno(stdin), O_BINARY) == -1)

    {

       fprintf(stderr, "Could not set binary mode on stdin.\n");

       return 1;

    }

#endif 

    if (init_io_cache(file, fileno(stdin), 0, READ_CACHE, (my_off_t) 0,

		      0, MYF(MY_WME | MY_NABP | MY_DONT_CHECK_FILESIZE)))

      return 1;

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]", (char *)table->record[0], table->s->reclength);

  DBUG_DUMP("m_after_image", (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", (char *)before_record, table->s->reclength);

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

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

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



  Rows_log_event* const ev=

    binlog_prepare_pending_rows_event(table, server_id, cols, colcnt,