diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-06-12 13:46:10 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-06-12 13:46:10 +0200 |
| commit | 1265506376a1a630517fbb3ccb25d020fc6aa81d (patch) | |
| tree | 4ef5c62accbd59b1cb969b180dd7fa87dfe7e630 /config | |
| parent | 37d97b58fadf2c8d670ee3aa6ae54267713682d2 (diff) | |
| parent | 894ec16b03a0907812dd4153773407dcc79e4fbe (diff) | |
| download | mariadb-git-1265506376a1a630517fbb3ccb25d020fc6aa81d.tar.gz | |
Merge jonas@perch:src/51-jonas
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index 505d000c196..ee31fa9fca2 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -197,7 +197,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" - # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" + CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" if test "$have_ndb_debug" = "default" then have_ndb_debug=$with_debug |