diff options
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/slave.h b/sql/slave.h index 43eb71be601..19ba4ad43ce 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -213,6 +213,15 @@ 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 |