diff options
| author | unknown <holyfoot@mysql.com> | 2006-05-12 14:16:20 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-05-12 14:16:20 +0500 |
| commit | 0ccda0521bf8728297f7e2bd4e7da2971a2aaae0 (patch) | |
| tree | beaf2c66c877f819c851918a8b1703ca4fd5da8f /config/ac-macros/ha_ndbcluster.m4 | |
| parent | 7fb64e0f87b0ad9b97ea63008bb2490077f7f0a7 (diff) | |
| parent | 564a94da7b744442cb4721cd53cb2d6c28452e51 (diff) | |
| download | mariadb-git-0ccda0521bf8728297f7e2bd4e7da2971a2aaae0.tar.gz | |
Merge
config/ac-macros/ha_ndbcluster.m4:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/log.cc:
SCCS merged
sql/sql_base.cc:
SCCS merged
Diffstat (limited to 'config/ac-macros/ha_ndbcluster.m4')
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index ecb8808bfa0..505d000c196 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -191,7 +191,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a" ndbcluster_system_libs="" ndb_mgmclient_libs="\$(top_builddir)/storage/ndb/src/mgmclient/libndbmgmclient.la" - mysql_se_objs="$mysql_se_objs ha_ndbcluster_binlog.o" MYSQL_CHECK_NDB_OPTIONS NDBCLUSTER_WORKAROUNDS @@ -282,9 +281,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ ndb_bin_am_ldflags="" fi - mysql_se_libs="$mysql_se_libs $ndbcluster_libs $ndbcluster_system_libs" - mysql_se_libs="$mysql_se_libs $NDB_SCI_LIBS" - AC_SUBST(NDB_VERSION_MAJOR) AC_SUBST(NDB_VERSION_MINOR) AC_SUBST(NDB_VERSION_BUILD) @@ -302,6 +298,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ AC_SUBST(ndbcluster_libs) AC_SUBST(ndbcluster_system_libs) AC_SUBST(ndb_mgmclient_libs) + AC_SUBST(NDB_SCI_LIBS) AC_SUBST(ndb_transporter_opt_objs) AC_SUBST(ndb_port) @@ -311,7 +308,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ AC_SUBST(NDB_DEFS) AC_SUBST(ndb_cxxflags_fix) - AC_CONFIG_FILES(storage/ndb/Makefile storage/ndb/include/Makefile dnl + AC_CONFIG_FILES(storage/ndb/include/Makefile dnl storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl storage/ndb/docs/Makefile dnl storage/ndb/tools/Makefile dnl |