bk commit into 5.0 tree (msvensson:1.2302)

[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-02 18:46:41+02:00, msvensson@neptunus.(none) +12 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.1616.2144.209

  include/my_global.h@stripped, 2006-10-02 18:43:46+02:00, msvensson@neptunus.(none) +0 -1
    Auto merged
    MERGE: 1.47.1.62

  mysql-test/r/ctype_utf8.result@stripped, 2006-10-02 18:43:46+02:00,
msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.45.1.32

  mysql-test/t/ctype_utf8.test@stripped, 2006-10-02 18:46:38+02:00, msvensson@neptunus.(none)
+0 -0
    Manual merge
    MERGE: 1.57.1.21

  sql/item_subselect.cc@stripped, 2006-10-02 18:43:47+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.60.1.84

  sql/item_timefunc.cc@stripped, 2006-10-02 18:43:47+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.51.6.2

  sql/mysql_priv.h@stripped, 2006-10-02 18:43:47+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.186.91.55

  sql/mysqld.cc@stripped, 2006-10-02 18:46:38+02:00, msvensson@neptunus.(none) +0 -1
    Manual merge
    MERGE: 1.356.98.30

  sql/opt_range.cc@stripped, 2006-10-02 18:43:47+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.98.2.51

  sql/set_var.cc@stripped, 2006-10-02 18:43:47+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.34.52.42

  sql/slave.cc@stripped, 2006-10-02 18:43:48+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.188.1.94

  sql/sql_acl.cc@stripped, 2006-10-02 18:43:48+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.74.1.107

  sql/sql_class.h@stripped, 2006-10-02 18:43:48+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.146.52.17

# 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-5.0-maint/RESYNC

--- 1.126/include/my_global.h	2006-10-02 18:46:47 +02:00
+++ 1.127/include/my_global.h	2006-10-02 18:46:47 +02:00
@@ -471,6 +471,9 @@
 #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