diff options
| author | unknown <mats@romeo.(none)> | 2007-01-26 20:56:49 +0100 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2007-01-26 20:56:49 +0100 |
| commit | eadb2c2d950000f588246976b1d4adda4f224b6f (patch) | |
| tree | 80b5e52588edfed50f1e2f6fca51c24688ed87b4 /sql/slave.h | |
| parent | 2d9e874740e6fd01013458d8116d1584ea8a6222 (diff) | |
| parent | 8a8bb772d4ca23ca01340c8445cf66353bfb58ea (diff) | |
| download | mariadb-git-eadb2c2d950000f588246976b1d4adda4f224b6f.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/b19033-mysql-5.1-new-rpl
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/slave.h:
Auto merged
sql/sql_insert.cc:
Auto merged
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 |