diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-02-24 11:52:08 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-02-24 11:52:08 +0100 |
| commit | 2a86b8ecfc0e93853b9a31c8c818048f8a153137 (patch) | |
| tree | 74216a789ffa49f90ad3de222b70c50b2477b271 /include/my_global.h | |
| parent | 61587c18639f4dfeb4e30e490c8b7785341c1eb5 (diff) | |
| parent | 6f6951d21867a2d71de414d21becf55feb3792b1 (diff) | |
| download | mariadb-git-2a86b8ecfc0e93853b9a31c8c818048f8a153137.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
client/mysqlbinlog.cc:
Auto merged
include/my_global.h:
Auto merged
mysql-test/extra/rpl_tests/rpl_insert_id.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysys/mf_iocache2.c:
Auto merged
sql/field.cc:
Auto merged
sql/item_xmlfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/t/disabled.def:
Manual merge
sql/log.cc:
Manual merge
sql/sql_insert.cc:
Manual merge
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 98733711d24..d92e5f07948 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1478,4 +1478,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 */ |