Commit 5bf5ccff authored by unknown's avatar unknown
Browse files

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 

into  romeo.(none):/home/bk/b23171-mysql-5.1-new-rpl


sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
parents 4c3283b3 c078453f

sql/log.cc

+1 −1
Original line number Diff line number Diff line
@@ -2423,7 +2423,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name, 
      /*

        Set 'created' to 0, so that in next relay logs this event does not

        trigger cleaning actions on the slave in

        Format_description_log_event::exec_event().

        Format_description_log_event::apply_event_impl().

      */

      description_event_for_queue->created= 0;

      /* Don't set log_pos in event header */

sql/log_event.cc

+144 −136

File changed.

Preview size limit exceeded, changes collapsed.

sql/log_event.h

+171 −42

File changed.

Preview size limit exceeded, changes collapsed.