branches/5.1:

Use CFLAGS instead of INNODB_CFLAGS to avoid having incompatible flags
inserted in CFLAGS and INNODB_CFLAGS and to avoid compiling mysql and
innodb with different flags.

Discussed with:	Sunny

Makefile.am

@@ -154,15 +154,15 @@ libinnobase_a_SOURCES =	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c	\
 			ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c		\
 			handler/ha_innodb.cc
 
-libinnobase_a_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_CFLAGS)
-libinnobase_a_CFLAGS  =	$(AM_CFLAGS) $(INNODB_CFLAGS)
+libinnobase_a_CXXFLAGS=	$(AM_CFLAGS)
+libinnobase_a_CFLAGS  =	$(AM_CFLAGS)
 
 EXTRA_LTLIBRARIES =	ha_innodb.la
 pkglib_LTLIBRARIES =	@plugin_innobase_shared_target@
 
 ha_innodb_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir)
-ha_innodb_la_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_innodb_la_CFLAGS  =	$(AM_CFLAGS) $(INNODB_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_innodb_la_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_innodb_la_CFLAGS  =	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
 ha_innodb_la_SOURCES =	$(libinnobase_a_SOURCES)
 
 EXTRA_DIST =		CMakeLists.txt plug.in \

plug.in

@@ -16,17 +16,17 @@ MYSQL_PLUGIN_ACTIONS(innobase,  [
   AC_C_BIGENDIAN
   case "$target_os" in
          lin*)
-           INNODB_CFLAGS="-DUNIV_LINUX";;
+           CFLAGS="-DUNIV_LINUX";;
          hpux10*)
-           INNODB_CFLAGS="-DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";;
+           CFLAGS="-DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";;
          hp*)
-           INNODB_CFLAGS="-DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";;
+           CFLAGS="-DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";;
          aix*)
-           INNODB_CFLAGS="-DUNIV_AIX";;
+           CFLAGS="-DUNIV_AIX";;
          irix*|osf*|sysv5uw7*|openbsd*)
-           INNODB_CFLAGS="-DUNIV_MUST_NOT_INLINE";;
+           CFLAGS="-DUNIV_MUST_NOT_INLINE";;
          *solaris*|*SunOS*)
-           INNODB_CFLAGS="-DUNIV_SOLARIS";;
+           CFLAGS="-DUNIV_SOLARIS";;
   esac
   INNODB_DYNAMIC_CFLAGS="-DMYSQL_DYNAMIC_PLUGIN"
   case "$target_cpu" in
@@ -38,7 +38,6 @@ MYSQL_PLUGIN_ACTIONS(innobase,  [
 		INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic"
 		;;
   esac
-  AC_SUBST(INNODB_CFLAGS)
   AC_SUBST(INNODB_DYNAMIC_CFLAGS)
   ])