summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorlenz@mysql.com <>2004-04-26 22:37:42 +0200
committerlenz@mysql.com <>2004-04-26 22:37:42 +0200
commitfc9a33929466f4405ed768fd0b0c7dbbae594c61 (patch)
tree051beda4dbeec275b54d123850d3d286e4d736ff /libmysqld
parent78b242c946ff166190ad998a9294023e26214a09 (diff)
downloadmariadb-git-fc9a33929466f4405ed768fd0b0c7dbbae594c61.tar.gz
- disabled the NDB Cluster from the embedded server
- added compiling of the NDB Cluster to compile-pentium-max
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 51e8271c001..4e65fa9364e 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -26,7 +26,7 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
-DDATADIR="\"$(MYSQLDATAdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\""
-INCLUDES= @MT_INCLUDES@ @ndbcluster_includes@ @bdb_includes@ -I$(top_srcdir)/include \
+INCLUDES= @MT_INCLUDES@ @bdb_includes@ -I$(top_srcdir)/include \
-I$(top_srcdir)/sql -I$(top_srcdir)/regex \
$(openssl_includes)
@@ -70,7 +70,7 @@ INC_LIB= $(top_builddir)/regex/libregex.a \
$(top_builddir)/myisam/libmyisam.a \
$(top_builddir)/myisammrg/libmyisammrg.a \
$(top_builddir)/heap/libheap.a \
- @ndbcluster_libs@ @innodb_libs@ @bdb_libs_with_path@ \
+ @innodb_libs@ @bdb_libs_with_path@ \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
$(top_builddir)/dbug/libdbug.a \