Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Manual merge
sql/mysqld.cc:
  Manual merge

include/my_global.h

@@ -471,6 +471,9 @@ typedef unsigned short ushort;
 #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