Merge mysql.com:/home/bkroot/mysql-5.1-new

into  mysql.com:/home/bk/w3023-mysql-5.1-new

1 files changed, 9 insertions, 2 deletions

diff --git a/sql/log_event.h b/sql/log_event.h
index a7c532d4c24..7a0c24ea626 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -657,11 +657,16 @@ public:
   {
     return (void*) my_malloc((uint)size, MYF(MY_WME|MY_FAE));
   }
+
   static void operator delete(void *ptr, size_t size)
   {
     my_free((gptr) ptr, MYF(MY_WME|MY_ALLOW_ZERO_PTR));
   }
 
+  /* Placement version of the above operators */
+  static void *operator new(size_t, void* ptr) { return ptr; }
+  static void operator delete(void*, void*) { }
+
 #ifndef MYSQL_CLIENT
   bool write_header(IO_CACHE* file, ulong data_length);
   virtual bool write(IO_CACHE* file)
@@ -1795,10 +1800,8 @@ public:
 
 #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
   virtual int exec_event(struct st_relay_log_info *rli);
-#ifdef DBUG_RBR
   virtual void pack_info(Protocol *protocol);
 #endif
-#endif
 
 #ifdef MYSQL_CLIENT
   /* not for direct call, each derived has its own ::print() */
@@ -1850,6 +1853,7 @@ public:
       Error code, or zero if write succeeded.
   */
 #if !defined(MYSQL_CLIENT) && defined(HAVE_ROW_BASED_REPLICATION)
+#if 0
   int maybe_write_table_map(THD *thd, IO_CACHE *file, MYSQL_LOG *log) const
   {
     /*
@@ -1864,6 +1868,9 @@ public:
     return result;
   }
 #endif
+#endif
+
+  uint     m_row_count;         /* The number of rows added to the event */
 
 protected:
   /*