diff options
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 25e04f66d74..d2f33ae20d3 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -650,11 +650,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) @@ -1788,10 +1793,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() */ @@ -1843,6 +1846,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 { /* @@ -1857,6 +1861,9 @@ public: return result; } #endif +#endif + + uint m_row_count; /* The number of rows added to the event */ protected: /* |