Merge of mysql-5.1-bugteam into mysql-trunk-merge.

Makefile.am

@@ -312,7 +312,7 @@ abi_check_all:	abi_check
 do_abi_check:
 	set -ex; \
 	for file in $(abi_headers); do \
-	         @CC@ -E -nostdinc -dI \
+	         @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \
 	                  -I$(top_srcdir)/include \
 	                  -I$(top_srcdir)/include/mysql \
 	                  -I$(top_srcdir)/sql \

configure.in

@@ -463,16 +463,7 @@ if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
 then
   ABI_CHECK=""
 else
-  # Workaround GCC >= 4.5 - See Bug#52514
-  case `$CC -dumpversion` in
-    [[4-9]].[[5-9]]*)
-      AC_MSG_WARN([ABI check disabled (GCC >= 4.5)])
-      ABI_CHECK=""
-      ;;
-    *)
-      ABI_CHECK="abi_check"
-      ;;
-  esac
+  ABI_CHECK="abi_check"
 fi
 
 AC_SUBST(ABI_CHECK)

include/mysql.h

@@ -44,7 +44,9 @@ extern "C" {
 #endif
 
 #ifndef _global_h				/* If not standard header */
+#ifndef MYSQL_ABI_CHECK
 #include <sys/types.h>
+#endif
 #ifdef __LCC__
 #include <winsock2.h>				/* For windows */
 #endif

include/mysql.h.pp

@@ -1,4 +1,3 @@
-#include <sys/types.h>
 typedef char my_bool;
 typedef int my_socket;
 #include "mysql_version.h"