mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
- disabled the NDB Cluster from the embedded server
- added compiling of the NDB Cluster to compile-pentium-max BUILD/compile-pentium-max: - added NDB Cluster include/mysql_embed.h: - disable NDB cluster for the embedded server by #undef'ing HAVE_NDBCLUSTER_DB libmysqld/Makefile.am: - remove ndbcluster_includes and ndbcluster_libs as NDB is not part of libmysqld anyway
This commit is contained in:
@ -9,6 +9,6 @@ extra_configs="$pentium_configs"
|
||||
|
||||
extra_configs="$extra_configs --with-innodb --with-berkeley-db \
|
||||
--with-embedded-server --enable-thread-safe-client \
|
||||
--with-openssl --with-vio --with-raid"
|
||||
--with-openssl --with-vio --with-raid --with-ndbcluster"
|
||||
|
||||
. "$path/FINISH.sh"
|
||||
|
@ -26,6 +26,7 @@
|
||||
#undef HAVE_OPENSSL
|
||||
#undef HAVE_ISAM
|
||||
#undef HAVE_SMEM /* No shared memory */
|
||||
#undef HAVE_NDBCLUSTER_DB /* No NDB cluster */
|
||||
|
||||
#define DONT_USE_RAID
|
||||
|
||||
|
@ -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 \
|
||||
|
Reference in New Issue
Block a user