diff options
| author | unknown <joerg@mysql.com> | 2005-05-26 12:51:44 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-05-26 12:51:44 +0200 |
| commit | 96f629db87b4c790f980dfeb539c8ddea0901354 (patch) | |
| tree | eaa4a697ce366f6da89001d3d3eaa62af2a7483b /include/my_global.h | |
| parent | f0f9b5959eecb87b369fc45c981d926b79de0c61 (diff) | |
| parent | 7e5651ca17706473c3ea791db48a08c849181f1c (diff) | |
| download | mariadb-git-96f629db87b4c790f980dfeb539c8ddea0901354.tar.gz | |
Manual merge.
client/mysqldump.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/item.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
support-files/mysql.spec.sh:
Auto merged
client/client_priv.h:
Manual merge (still to be corrected!)
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 75a99133e33..98a47a621ca 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -310,12 +310,14 @@ C_MODE_END #endif #if defined(__ia64__) #define new my_arg_new +#define need_to_restore_new 1 #endif C_MODE_START #include <asm/atomic.h> C_MODE_END -#if defined(__ia64__) +#ifdef need_to_restore_new /* probably safer than #ifdef new */ #undef new +#undef need_to_restore_new #endif #endif #include <errno.h> /* Recommended by debian */ |