diff --git a/configure.in b/configure.in index 7d7c477e0f28f91f4d773880cbb09913d58d0ba2..2c387125675405582cb2277d5b1ff5b6339725f1 100644 --- a/configure.in +++ b/configure.in @@ -2752,6 +2752,14 @@ EOF if test X"$have_ndbcluster" = Xyes then + if test X"$mysql_cv_compress" != Xyes + then + echo + echo "MySQL Cluster table handler ndbcluster requires compress/uncompress." + echo "Commonly available in libzlib.a. Please install and rerun configure." + echo + exit 1 + fi sql_server_dirs="$sql_server_dirs ndb" echo "CONFIGURING FOR NDB CLUSTER" case $with_debug in diff --git a/ndb/Makefile b/ndb/Makefile index 475914f61202b52acd70ebf971eb6ace23cb77f7..8788eae885d1728f72b41758199be2fe99e0af0d 100644 --- a/ndb/Makefile +++ b/ndb/Makefile @@ -7,11 +7,11 @@ replace-targets := all clean NDB_RELEASE := $(shell ../scripts/mysql_config --version) all: - $(MAKE) -C src - $(MAKE) -C test/src - $(MAKE) -C tools - $(MAKE) -C test/ndbapi/flexBench - $(MAKE) -C test/tools/waiter + $(MAKE) -j 1 -C src + $(MAKE) -j 1 -C test/src + $(MAKE) -j 1 -C tools + $(MAKE) -j 1 -C test/ndbapi/flexBench + $(MAKE) -j 1 -C test/tools/waiter include $(NDB_TOP)/Epilogue.mk diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp index 790c29737e91620af5ee6e6d46225652fde33802..78616dd72343b3d3fd30a574c95c4e71c79ea692 100644 --- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp +++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp @@ -14,6 +14,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <ndb_global.h> + #define DBDICT_C #include "Dbdict.hpp" @@ -5703,7 +5705,7 @@ void Dbdict::sendGET_TABINFOREF(Signal* signal, }//sendGET_TABINFOREF() Uint32 convertEndian(Uint32 in) { -#ifdef _BIG_ENDIAN +#ifdef WORDS_BIGENDIAN Uint32 ut = 0; ut += ((in >> 24) & 255); ut += (((in >> 16) & 255) << 8); diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp index a78a1f0255e1a8ea980753661736fb88fe7cbbe6..a9d90c768dd9d4dd22a19812116bb46e3ea17297 100644 --- a/ndb/src/ndbapi/Ndb.cpp +++ b/ndb/src/ndbapi/Ndb.cpp @@ -992,7 +992,7 @@ Ndb::StartTransactionNodeSelectionData::release(){ Uint32 convertEndian(Uint32 Data) { -#ifdef _BIG_ENDIAN +#ifdef WORDS_BIGENDIAN Uint32 t1, t2, t3, t4; t4 = (Data >> 24) & 255; t3 = (Data >> 16) & 255;