From feaf6d1615906c98436c2b1c180aa35c39c83e28 Mon Sep 17 00:00:00 2001
From: "dli@dev3-76.dev.cn.tlan" <>
Date: Tue, 14 Nov 2006 15:58:06 +0800
Subject: ndb - fix for BUG#23137, ha_ndbcluster.m4 bug.

Because NDB_CXXFLAGS is just used in ndb engine, moved NDB_CXXFLAGS from ha_ndbcluster.m4 to ndb/config/common.mk.am.
---
 config/ac-macros/ha_ndbcluster.m4 | 1 -
 1 file changed, 1 deletion(-)

(limited to 'config')

diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index ee31fa9fca2..0371eff6537 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -197,7 +197,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
 
   MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
 
-  CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
   if test "$have_ndb_debug" = "default"
   then
     have_ndb_debug=$with_debug
-- 
cgit v1.2.1


From 581b8504f3235426c3fbc6ea671fe15917b05355 Mon Sep 17 00:00:00 2001
From: "istruewing@chilla.local" <>
Date: Mon, 30 Apr 2007 18:49:38 +0200
Subject: WL#2936 - Falcon & MySQL plugin interface: server variables Avoid
 compiler warnings

---
 config/ac-macros/misc.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4
index 6e9dfe8231c..a20db96a950 100644
--- a/config/ac-macros/misc.m4
+++ b/config/ac-macros/misc.m4
@@ -479,7 +479,7 @@ AC_MSG_CHECKING(if conversion of longlong to float works)
 AC_CACHE_VAL(ac_cv_conv_longlong_to_float,
 [AC_TRY_RUN([#include <stdio.h>
 typedef long long longlong;
-main()
+int main()
 {
   longlong ll=1;
   float f;
@@ -487,7 +487,7 @@ main()
   f = (float) ll;
   fprintf(file,"%g\n",f);
   fclose(file);
-  exit (0);
+  return (0);
 }], ac_cv_conv_longlong_to_float=`cat conftestval`, ac_cv_conv_longlong_to_float=0, ifelse([$2], , , ac_cv_conv_longlong_to_float=$2))])dnl
 if test "$ac_cv_conv_longlong_to_float" = "1" -o "$ac_cv_conv_longlong_to_float" = "yes"
 then
-- 
cgit v1.2.1