From f60346193e20d6ac6fc9b25d66acc1c9d0c5ac0c Mon Sep 17 00:00:00 2001
From: unknown <mats@romeo.(none)>
Date: Fri, 23 Feb 2007 18:54:26 +0100
Subject: [PATCH] BUG#19033 (RBR: slave does not handle schema changes
 correctly): Post-merge fixes.

include/my_global.h:
  Post-merge fixes.
  Moving placement versions of operator new and operator delete to general
  server-wide header.
sql/slave.h:
  Post-merge fixes.
  Moving placement versions of operator new and operator delete to general
  server-wide header.
storage/ndb/include/ndb_global.h.in:
  Removing local definition of placement versions of
  operator new and operator delete.
---
 include/my_global.h                 | 11 +++++++++++
 sql/slave.h                         |  9 ---------
 storage/ndb/include/ndb_global.h.in |  2 --
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/my_global.h b/include/my_global.h
index 1c238f0392f..798f195ce80 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1512,4 +1512,15 @@ do { doubleget_union _tmp; \
 #define dlerror() ""
 #endif
 
+/*
+  Define placement versions of operator new and operator delete since
+  we cannot be sure that the <new> include exists.
+ */
+#ifdef __cplusplus
+inline void *operator new(size_t, void *ptr) { return ptr; }
+inline void *operator new[](size_t, void *ptr) { return ptr; }
+inline void  operator delete(void*, void*) { /* Do nothing */ }
+inline void  operator delete[](void*, void*) { /* Do nothing */ }
+#endif
+
 #endif /* my_global_h */
diff --git a/sql/slave.h b/sql/slave.h
index 226f19fcd0c..a0febe3fd73 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -214,15 +214,6 @@ extern I_List<THD> threads;
 #define SLAVE_IO  1
 #define SLAVE_SQL 2
 
-/*
-  Define placement versions of operator new and operator delete since
-  we cannot be sure that the <new> include exists.
- */
-inline void *operator new(size_t, void *ptr) { return ptr; }
-inline void *operator new[](size_t, void *ptr) { return ptr; }
-inline void  operator delete(void*, void*) { /* Do nothing */ }
-inline void  operator delete[](void*, void*) { /* Do nothing */ }
-
 #endif
 
 
diff --git a/storage/ndb/include/ndb_global.h.in b/storage/ndb/include/ndb_global.h.in
index 60d32f62ee3..dd4303f949c 100644
--- a/storage/ndb/include/ndb_global.h.in
+++ b/storage/ndb/include/ndb_global.h.in
@@ -115,8 +115,6 @@ static const char table_name_separator =  '/';
 #endif
 
 #ifdef  __cplusplus
-inline void* operator new(size_t, void* __p) { return __p; }
-inline void* operator new[](size_t, void* __p) { return __p; }
 extern "C" {
 #endif