Commit f6034619 authored by unknown's avatar unknown
Browse files

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.
parent 5f7f3a5b

include/my_global.h

+11 −0
Original line number Diff line number Diff line
@@ -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 */

sql/slave.h

+0 −9
Original line number Diff line number Diff line
@@ -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

storage/ndb/include/ndb_global.h.in

+0 −2
Original line number Diff line number Diff line
@@ -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