bk commit into 5.0 tree (msvensson:1.2305)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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, 2006-10-03 01:04:18+02:00, msvensson@shellback.(none) +2 -0
  Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
  into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.1616.2144.205

  include/m_ctype.h@stripped, 2006-10-03 01:02:18+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.102.1.7

  include/my_global.h@stripped, 2006-10-03 01:04:15+02:00, msvensson@shellback.(none) +1 -1
    Manual merge
    MERGE: 1.47.1.63

# 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:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.120/include/m_ctype.h	2006-10-03 01:04:26 +02:00
+++ 1.121/include/m_ctype.h	2006-10-03 01:04:26 +02:00
@@ -184,7 +184,7 @@
   
   /* Charset dependant snprintf() */
   int  (*snprintf)(struct charset_info_st *, char *to, uint n, const char *fmt,
-		   ...) ATTRIBUTE_FORMAT(printf, 4, 5);
+		   ...) ATTRIBUTE_FORMAT_FPTR(printf, 4, 5);
   int  (*long10_to_str)(struct charset_info_st *, char *to, uint n, int radix,
 			long int val);
   int (*longlong10_to_str)(struct charset_info_st *, char *to, uint n,

--- 1.127/include/my_global.h	2006-10-03 01:04:26 +02:00
+++ 1.128/include/my_global.h	2006-10-03 01:04:26 +02:00
@@ -471,9 +471,6 @@
 #ifndef __attribute__
 # if !defined(__GNUC__)
 #  define __attribute__(A)
-# elif defined (__QNXNTO__)
-   /* qcc defines GNUC */
-#  define __attribute__(A)
 # elif GCC_VERSION < 2008
 #  define __attribute__(A)
 # elif defined(__cplusplus) && GCC_VERSION < 3004
@@ -488,6 +485,19 @@
 */
 #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
 
 /*