mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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.
This commit is contained 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
|
||||
|
||||
|
Reference in New Issue
Block a user