diff options
| author | lenz@mysql.com <> | 2004-04-26 22:37:42 +0200 |
|---|---|---|
| committer | lenz@mysql.com <> | 2004-04-26 22:37:42 +0200 |
| commit | fc9a33929466f4405ed768fd0b0c7dbbae594c61 (patch) | |
| tree | 051beda4dbeec275b54d123850d3d286e4d736ff | |
| parent | 78b242c946ff166190ad998a9294023e26214a09 (diff) | |
| download | mariadb-git-fc9a33929466f4405ed768fd0b0c7dbbae594c61.tar.gz | |
- disabled the NDB Cluster from the embedded server
- added compiling of the NDB Cluster to compile-pentium-max
| -rwxr-xr-x | BUILD/compile-pentium-max | 2 | ||||
| -rw-r--r-- | include/mysql_embed.h | 1 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium-max index 4563f5ae827..caf657a2049 100755 --- a/BUILD/compile-pentium-max +++ b/BUILD/compile-pentium-max @@ -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" diff --git a/include/mysql_embed.h b/include/mysql_embed.h index 7a169d4133e..8e65087c566 100644 --- a/include/mysql_embed.h +++ b/include/mysql_embed.h @@ -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 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 \ |