diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-02-25 00:12:14 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-02-25 00:12:14 +0100 |
| commit | a5abde17ea2302997c961d5c583c73457c8caa42 (patch) | |
| tree | fd74b1013c9be4a5a0da2140ba725d8b4dbdcf71 /include/my_global.h | |
| parent | 3c9904123b6e2a07dff025f5e92c82d18afdad58 (diff) | |
| parent | 56e143c5e28e1220bd04417549f7f6e1b6fd7545 (diff) | |
| download | mariadb-git-a5abde17ea2302997c961d5c583c73457c8caa42.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/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index e25752b8ed8..c41ac8f915f 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1479,4 +1479,11 @@ do { doubleget_union _tmp; \ #define dlerror() "" #endif +/* + Include standard definitions of operator new and delete. + */ +#ifdef __cplusplus +#include <new> +#endif + #endif /* my_global_h */ |