Commit ca3d54e1 authored by unknown's avatar unknown
Browse files

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

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


include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  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
parents f41cd192 60dc71eb

include/my_global.h

+3 −0
Original line number Diff line number Diff line
@@ -563,6 +563,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