bk commit into 4.1 tree (msvensson:1.2252)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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.2252 05/05/09 11:23:12 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug10241
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  sql/item.h
    1.180 05/05/09 11:23:08 msvensson@neptunus.(none) +0 -0
    Auto merged

  include/my_global.h
    1.86 05/05/09 11:23:08 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-4.1/RESYNC

--- 1.179/sql/item.h	2005-05-05 10:55:01 +02:00
+++ 1.180/sql/item.h	2005-05-09 11:23:08 +02:00
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 

--- 1.85/include/my_global.h	2005-05-04 15:05:53 +02:00
+++ 1.86/include/my_global.h	2005-05-09 11:23:08 +02:00
@@ -219,18 +219,6 @@
 #define BAD_MEMCPY
 #endif
 
-/* In Linux-alpha we have atomic.h if we are using gcc */
-#if defined(TARGET_OS_LINUX) && defined(__GNUC__) && defined(__alpha__) && (__GNUC__ > 2 || ( __GNUC__ == 2 &&  __GNUC_MINOR__ >= 95)) && !defined(HAVE_ATOMIC_ADD)
-#define HAVE_ATOMIC_ADD
-#define HAVE_ATOMIC_SUB
-#endif
-
-/* In Linux-ia64 including atomic.h will give us an error */
-#if (defined(TARGET_OS_LINUX) && defined(__GNUC__) && (defined(__ia64__)||defined(__powerpc64__))) || !defined(THREAD)
-#undef HAVE_ATOMIC_ADD
-#undef HAVE_ATOMIC_SUB
-#endif
-
 #if defined(_lint) && !defined(lint)
 #define lint
 #endif