diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-05-10 08:06:09 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-05-10 08:06:09 +0200 |
| commit | 8d8a3205c579333ae84c9242365ddca0202306d9 (patch) | |
| tree | 2d5565953b289fe2d26ba02e3f090fec5de45661 /config/ac-macros | |
| parent | b32473a3d56374ae2620ecead5d29ff6d2239e96 (diff) | |
| parent | 3d78e6fcd3b99c69416893a30e991aeb51eb6763 (diff) | |
| download | mariadb-git-8d8a3205c579333ae84c9242365ddca0202306d9.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/handler.cc:
manual merge
sql/mysqld.cc:
manual merge
sql/set_var.cc:
manual merge
sql/sql_plugin.cc:
manual merge
Diffstat (limited to 'config/ac-macros')
| -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 |