Commit d357d70a authored by tomas@mc05.(none)'s avatar tomas@mc05.(none)

ndb tablehandler, ndb make and endien define, see each file

parent 8f5dcfba
...@@ -2752,6 +2752,14 @@ EOF ...@@ -2752,6 +2752,14 @@ EOF
if test X"$have_ndbcluster" = Xyes if test X"$have_ndbcluster" = Xyes
then 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" sql_server_dirs="$sql_server_dirs ndb"
echo "CONFIGURING FOR NDB CLUSTER" echo "CONFIGURING FOR NDB CLUSTER"
case $with_debug in case $with_debug in
......
...@@ -7,11 +7,11 @@ replace-targets := all clean ...@@ -7,11 +7,11 @@ replace-targets := all clean
NDB_RELEASE := $(shell ../scripts/mysql_config --version) NDB_RELEASE := $(shell ../scripts/mysql_config --version)
all: all:
$(MAKE) -C src $(MAKE) -j 1 -C src
$(MAKE) -C test/src $(MAKE) -j 1 -C test/src
$(MAKE) -C tools $(MAKE) -j 1 -C tools
$(MAKE) -C test/ndbapi/flexBench $(MAKE) -j 1 -C test/ndbapi/flexBench
$(MAKE) -C test/tools/waiter $(MAKE) -j 1 -C test/tools/waiter
include $(NDB_TOP)/Epilogue.mk include $(NDB_TOP)/Epilogue.mk
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <ndb_global.h>
#define DBDICT_C #define DBDICT_C
#include "Dbdict.hpp" #include "Dbdict.hpp"
...@@ -5703,7 +5705,7 @@ void Dbdict::sendGET_TABINFOREF(Signal* signal, ...@@ -5703,7 +5705,7 @@ void Dbdict::sendGET_TABINFOREF(Signal* signal,
}//sendGET_TABINFOREF() }//sendGET_TABINFOREF()
Uint32 convertEndian(Uint32 in) { Uint32 convertEndian(Uint32 in) {
#ifdef _BIG_ENDIAN #ifdef WORDS_BIGENDIAN
Uint32 ut = 0; Uint32 ut = 0;
ut += ((in >> 24) & 255); ut += ((in >> 24) & 255);
ut += (((in >> 16) & 255) << 8); ut += (((in >> 16) & 255) << 8);
......
...@@ -992,7 +992,7 @@ Ndb::StartTransactionNodeSelectionData::release(){ ...@@ -992,7 +992,7 @@ Ndb::StartTransactionNodeSelectionData::release(){
Uint32 Uint32
convertEndian(Uint32 Data) convertEndian(Uint32 Data)
{ {
#ifdef _BIG_ENDIAN #ifdef WORDS_BIGENDIAN
Uint32 t1, t2, t3, t4; Uint32 t1, t2, t3, t4;
t4 = (Data >> 24) & 255; t4 = (Data >> 24) & 255;
t3 = (Data >> 16) & 255; t3 = (Data >> 16) & 255;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment