1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#19033 (RBR: slave does not handle schema changes correctly):

Browse Source 
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.
This commit is contained in:
unknown 2007-02-23 18:54:26 +01:00
parent 5f7f3a5b81
commit f60346193e
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/my_global.h
View File

@ -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 */

9
sql/slave.h
View File

@ -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

2
storage/ndb/include/ndb_global.h.in
View File

@ -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