diff options
| author | unknown <dli@dev3-164.dev.cn.tlan> | 2007-04-24 10:28:11 +0800 |
|---|---|---|
| committer | unknown <dli@dev3-164.dev.cn.tlan> | 2007-04-24 10:28:11 +0800 |
| commit | 9500194ebdf39ec33b6899643b440cc4f0d5732d (patch) | |
| tree | ba784af3cc1159be5311f792c03d5ebe35b958aa /config | |
| parent | c38ec9d2ce71be993c185d3d66017ff1f6a1218e (diff) | |
| parent | 2b76ee2435cd9c436dfc592d76317f5eff9392a5 (diff) | |
| download | mariadb-git-9500194ebdf39ec33b6899643b440cc4f0d5732d.tar.gz | |
Merge dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-23137
config/ac-macros/ha_ndbcluster.m4:
Auto merged
storage/ndb/config/common.mk.am:
Auto merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index 2a54638b3ae..04244b9ec13 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 |