bk commit into 4.1 tree (ramil:1.2315) BUG#7851

[ramil]

Below is the list of changes that have just been committed into a local
4.1 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2315 05/06/24 12:51:11 ramil@stripped +1 -0
  an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h).

  include/my_global.h
    1.95 05/06/24 12:51:07 ramil@stripped +0 -2
    an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h).
    redefine 'new' before #include <asm/atomic.h> in any case.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/mysql-4.1

--- 1.94/include/my_global.h	2005-06-08 21:40:57 +05:00
+++ 1.95/include/my_global.h	2005-06-24 12:51:07 +05:00
@@ -274,10 +274,8 @@
 #include <alloca.h>
 #endif
 #ifdef HAVE_ATOMIC_ADD
-#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