bk commit into 5.1 tree (msvensson:1.2475)

[msvensson]

Below is the list of changes that have just been committed into a local
5.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@stripped, 2007-04-24 14:07:30+02:00, msvensson@stripped +4 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.1810.2857.16

  include/Makefile.am@stripped, 2007-04-24 14:07:29+02:00, msvensson@stripped +1 -2
    Manual merge
    MERGE: 1.52.2.14

  include/m_ctype.h@stripped, 2007-04-24 14:05:58+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.114.1.13

  include/my_global.h@stripped, 2007-04-24 14:05:58+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.96.1.43

  include/my_sys.h@stripped, 2007-04-24 14:05:58+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.178.2.18

# 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:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-maint/RESYNC

--- 1.79/include/Makefile.am	2007-04-11 09:14:09 +02:00
+++ 1.80/include/Makefile.am	2007-04-24 14:07:29 +02:00
@@ -26,7 +26,7 @@ pkginclude_HEADERS =	$(HEADERS_ABI) my_d
 			errmsg.h my_global.h my_net.h \
 			my_getopt.h sslopt-longopts.h my_dir.h \
 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
-			m_ctype.h mysql/plugin.h $(HEADERS_GEN)
+			m_ctype.h mysql/plugin.h my_attribute.h $(HEADERS_GEN)
 noinst_HEADERS =	config-win.h config-netware.h \
 			heap.h my_bitmap.h my_uctype.h \
 			myisam.h myisampack.h myisammrg.h ft_global.h\

--- 1.134/include/m_ctype.h	2007-01-29 00:51:37 +01:00
+++ 1.135/include/m_ctype.h	2007-04-24 14:05:58 +02:00
@@ -21,6 +21,8 @@
 #ifndef _m_ctype_h
 #define _m_ctype_h
 
+#include <my_attribute.h>
+
 #ifdef	__cplusplus
 extern "C" {
 #endif

--- 1.219/include/my_sys.h	2007-03-28 20:05:00 +02:00
+++ 1.220/include/my_sys.h	2007-04-24 14:05:58 +02:00
@@ -31,10 +31,7 @@ extern int NEAR my_errno;		/* Last error
 #include <my_pthread.h>
 #endif
 
-#ifndef _m_ctype_h
 #include <m_ctype.h>                    /* for CHARSET_INFO */
-#endif
-
 #include <stdarg.h>
 #include <typelib.h>
 

--- 1.165/include/my_global.h	2007-04-24 11:21:38 +02:00
+++ 1.166/include/my_global.h	2007-04-24 14:05:58 +02:00
@@ -593,43 +593,7 @@ typedef unsigned short ushort;
 #define my_const_cast(A) (A)
 #endif
 
-/*
-  Disable __attribute__() on gcc < 2.7, g++ < 3.4, and non-gcc compilers.
-  Some forms of __attribute__ are actually supported in earlier versions of
-  g++, but we just disable them all because we only use them to generate
-  compilation warnings.
-*/
-#ifndef __attribute__
-# if !defined(__GNUC__)
-#  define __attribute__(A)
-# elif GCC_VERSION < 2008
-#  define __attribute__(A)
-# elif defined(__cplusplus) && GCC_VERSION < 3004
-#  define __attribute__(A)
-# endif
-#endif
-
-/*
-  __attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4
-  But that's already covered by the __attribute__ tests above, so this is
-  just a convenience macro.
-*/
-#ifndef ATTRIBUTE_FORMAT
-# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
-#endif
-
-/*
-
-   __attribute__((format(...))) on a function pointer is not supported
-   until  gcc 3.1
-*/
-#ifndef ATTRIBUTE_FORMAT_FPTR
-# if (GCC_VERSION >= 3001)
-#  define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n)
-# else
-#  define ATTRIBUTE_FORMAT_FPTR(style, m, n)
-# endif /* GNUC >= 3.1 */
-#endif
+#include <my_attribute.h>
 
 /*
   Wen using the embedded library, users might run into link problems,