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

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

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/b23171-mysql-5.1-new-rpl
edb70453 · mats@romeo.(none) · efaa0f40 · 9372c38c · edb70453 · edb70453
Commit edb70453 authored Nov 04, 2006 by mats@romeo.(none)
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 316 additions and 179 deletions

sql/log.cc sql/log.cc +1 -1

sql/log_event.cc sql/log_event.cc +144 -136

sql/log_event.h sql/log_event.h +171 -42

No files found.
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -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 */

--- a/sql/log_event.cc
+++ b/sql/log_event.cc
--- a/sql/log_event.h
+++ b/sql/log_event.h