bk commit into 5.1 tree (dli:1.2320) BUG#23137

[David Li]

Below is the list of changes that have just been committed into a local
5.1 repository of dli. When dli does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-14 15:58:06+08:00, dli@stripped +2 -0
  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@stripped, 2006-11-14 15:58:03+08:00, dli@stripped +0 -1
    removed NDB_CXXFLAGS.

  storage/ndb/config/common.mk.am@stripped, 2006-11-14 15:58:03+08:00, dli@stripped +2 -0
    Added NDB_CXXFLAGS to AM_CXXFLAGS.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dli
# Host:	dev3-76.dev.cn.tlan
# Root:	/home/dli/mysql/mysql-5.1/mysql-5.1-bug-23137

--- 1.19/config/ac-macros/ha_ndbcluster.m4	2006-11-14 15:58:17 +08:00
+++ 1.20/config/ac-macros/ha_ndbcluster.m4	2006-11-14 15:58:17 +08:00
@@ -197,7 +197,6 @@
 
   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

--- 1.10/storage/ndb/config/common.mk.am	2006-11-14 15:58:17 +08:00
+++ 1.11/storage/ndb/config/common.mk.am	2006-11-14 15:58:17 +08:00
@@ -10,3 +10,5 @@
 LDADD = $(LDADD_LOC)
 DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
 NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) 
+NDB_AM_CXXFLAGS:= $(AM_CXXFLAGS)
+AM_CXXFLAGS=$(NDB_AM_CXXFLAGS) $(NDB_CXXFLAGS)