bk commit into 4.1 tree (serg:1.2291)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.1 repository of serg. When serg 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.2291 05/05/24 21:02:42 serg@stripped +1 -0
  simplifying new/my_arg_new wrapping

  include/my_global.h
    1.90 05/05/24 21:02:35 serg@stripped +3 -1
    simplifying new/my_arg_new wrapping

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.1

--- 1.89/include/my_global.h	Mon May 23 18:53:50 2005
+++ 1.90/include/my_global.h	Tue May 24 21:02:35 2005
@@ -289,12 +289,14 @@
 #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 */