Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb

ndb/config/old_files/Defs.DEBUG.mk

-
-VERSION_FLAGS := -DNDB_DEBUG -DUSE_EMULATED_JAM -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD
-#-DDEBUG_TRANSPORTER
-

ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk

-###
-#
-# Defines
-SHELL      := /bin/sh
-
-C++        := g++
-CC         := gcc
-AR_RCS     := ar rcs 
-SO         := ld -b -o
-
-SHLIBEXT   := sl
-
-MAKEDEPEND := g++ -M
-PIC        := -fPIC
-
-RPCGENFLAGS := -MA -C -N
-ETAGS       := etags
-CTAGS       := ctags
-
-###
-#
-# Flags
-# 
-CCFLAGS_WARNINGS = -Wno-long-long -W -Wall -pedantic 
-# -Wno-sign-compare Use this flag if you are annoyed with all the warnings
-CCFLAGS_TOP = -DHPUX -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DNO_COMMAND_HANDLER
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O3
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O3 -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDFLAGS_TOP = -lpthread -lnsl -lrt
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)
-

ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk

-###
-#
-# Defines
-SHELL       := /bin/sh
-
-C++         := g++ 
-CC          := gcc
-AR_RCS      := $(PURE) ar rcs 
-SO          := g++ -shared -o
-
-MAKEDEPEND  := g++ -M
-PIC         := -fPIC
-
-RPCGENFLAGS := -M -C -N
-
-ETAGS       := etags
-CTAGS       := ctags
-
-###
-#
-# Flags
-# 
-CCFLAGS_WARNINGS = -Wno-long-long -Wall #-pedantic
-# Add these for more warnings -Weffc++ -W
-CCFLAGS_TOP = -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-CCFLAGS_TOP += -fno-rtti
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O3
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O3 -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDFLAGS_TOP = -lpthread -lrt
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)

ndb/config/old_files/Defs.LINUX.x86.GCC.mk

-###
-#
-# Defines
-SHELL       := /bin/sh
-
-C++         := gcc$(GCC_VERSION)
-CC          := gcc$(GCC_VERSION)
-AR_RCS      := $(PURE) ar rcs 
-SO          := gcc$(GCC_VERSION) -shared -lpthread -o 
-#SO          := gcc$(GCC_VERSION) -shared -o 
-
-MAKEDEPEND  := gcc$(GCC_VERSION) -M
-#MAKEDEPEND  := gcc$(GCC_VERSION) -M  -nostdinc -nostdinc++
-PIC         := -fPIC
-
-RPCGENFLAGS := -M -C -N
-
-ETAGS       := etags
-CTAGS       := ctags
-
-###
-#
-# Flags
-# 
-# gcc3.3 __THROW problem if -pedantic and -O2
-ifeq ($(NDB_VERSION),DEBUG)
-CCFLAGS_WARNINGS = -Wno-long-long -Wall -pedantic
-else
-CCFLAGS_WARNINGS = -Wno-long-long -Wall
-endif
-# Add these for more warnings -Weffc++ -W
-CCFLAGS_TOP = 
-#CCFLAGS_TOP = -DSAFE_MUTEX
-CCFLAGS_TOP += -fno-rtti -fno-exceptions
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O2
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O2 -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDFLAGS_TOP = 
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(CC) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)
-
-LDFLAGS_LAST = -lrt -lpthread $(NDB_TOP)/src/common/portlib/gcc.cpp 
-#LDFLAGS_LAST = -lrt $(NDB_TOP)/src/common/portlib/gcc.cpp $(NDB_TOP)/../mysys/libmysys.a $(NDB_TOP)/../dbug/libdbug.a $(NDB_TOP)/../regex/libregex.a $(NDB_TOP)/../strings/libmystrings.a -lpthread

ndb/config/old_files/Defs.LINUX.x86.ICC.mk

-###
-#
-# Defines
-SHELL       := /bin/sh
-
-C++         := icc
-CC          := icc
-AR_RCS      := $(PURE) ar rcs 
-SO          := g++$(GCC_VERSION) -shared -lpthread -o
-
-MAKEDEPEND  := g++$(GCC_VERSION) -M
-PIC         := -fPIC
-
-RPCGENFLAGS := -M -C -N
-
-ETAGS       := etags
-CTAGS       := ctags
-
-###
-#
-# Flags
-# 
-# gcc3.3 __THROW problem if -pedantic and -O2
-ifeq ($(NDB_VERSION),DEBUG)
-CCFLAGS_WARNINGS = 
-else
-CCFLAGS_WARNINGS = 
-endif
-# Add these for more warnings -Weffc++ -W
-CCFLAGS_TOP = -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-CCFLAGS_TOP += 
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O2
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O2 -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDFLAGS_TOP = -lpthread -lrt
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)

ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk

-###
-#
-# Defines
-SHELL       := /bin/sh
-
-C++         := g++ 
-CC          := gcc
-AR_RCS      := $(PURE) ar rcs 
-SO          := g++ -shared -lpthread -o
-
-MAKEDEPEND  := g++ -M
-PIC         := -fPIC
-
-RPCGENFLAGS := -M -C -N
-
-ETAGS       := etags
-CTAGS       := ctags
-
-###
-#
-# Flags
-# 
-# gcc3.3 __THROW problem if -pedantic and -O2
-ifeq ($(NDB_VERSION),DEBUG)
-CCFLAGS_WARNINGS = -Wno-long-long -Wall -pedantic
-else
-CCFLAGS_WARNINGS = -Wno-long-long -Wall
-endif
-# Add these for more warnings -Weffc++ -W
-CCFLAGS_TOP = -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-CCFLAGS_TOP += -fno-rtti -fno-exceptions -m64
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O2
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O2 -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDFLAGS_TOP = -lpthread -lrt
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)

ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk

-###
-#
-# Defines
-SHELL       := /bin/sh
-
-C++         := gcc 
-CC          := gcc
-CXX         := gcc
-AR_RCS      := $(PURE) ar rcs 
-#SO          := g++ -dynamiclib -Wl,-segprot,__TEXT,rwx,rwx -o 
-SO          := gcc -dynamiclib -o 
-
-SHLIBEXT   := dylib
-
-MAKEDEPEND  := gcc -M
-PIC         := -fPIC
-
-RPCGENFLAGS := -M -C -N
-
-ETAGS       := etags
-CTAGS       := ctags
-
-###
-#
-# Flags
-# 
-CCFLAGS_WARNINGS = -Wno-long-long -Wall -Winline #-Werror#-pedantic
-# Add these for more warnings -Weffc++ -W
-CCFLAGS_TOP = -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_BIG_ENDIAN
-CXX_FLAGS_TOP = -fno-rtti -felide-constructors -fno-exceptions -fno-omit-fram-pointer
-C_FLAGS_TOP += -fno-omit-frame-pointer 
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O3
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O3 -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(CXXFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(C_FLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDFLAGS_TOP =  
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)
-
-#LDFLAGS_LAST = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
-LDFLAGS_LAST = -lstdc++
-

ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk

-###
-#
-# Defines
-SHELL      := /bin/sh
-
-C++        := dplus 
-CC         := dcc
-AR_RCS     := $(PURE) ar rcs 
-SO         := dar -r
-
-MAKEDEPEND := g++ -M -nostdinc
-PIC        := 
-
-RPCGENFLAGS := -MA -C -N
-
-###
-#
-# Flags
-# 
-CCFLAGS_INCLUDE = -I/vobs/cello/cls/rtosi_if/include -I/vobs/cello/cls/rtosi_if/include.mp750 -I/vobs/cello/cls/rtosi_if/include.ppc 
-CCFLAGS_TOP =  -tPPC750EH -DBIG_ENDIAN -D_BIG_ENDIAN       -DPPC -DPPC750 -DOSE_DELTA -DMP -Xlint -Xforce-prototypes -DINLINE=__inline__  -Xansi -Xsmall-data=0 -Xsmall-const=0 -Xstrings-in-text
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -XO
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -XO -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_INCLUDE)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_INCLUDE) 
-
-LDFLAGS_TOP = 
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)
-
-
-

ndb/config/old_files/Defs.RELEASE.mk

-
-VERSION_FLAGS := -DNDB_RELEASE -DUSE_EMULATED_JAM -DNDEBUG
-

ndb/config/old_files/Defs.RELEASE_TRACE.mk

-
-VERSION_FLAGS := -DNDB_RELEASE -DUSE_EMULATED_JAM -DNDEBUG -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD 
-

ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk

-###
-#
-# Defines
-SHELL      := /bin/sh
-
-C++        := g++ 
-CC         := gcc
-AR_RCS     := $(PURE) ar rcs 
-SO         := g++ -shared -o
-
-MAKEDEPEND := g++ -M
-PIC        := -fPIC
-
-###
-#
-# Flags
-# 
-NDB_STRDUP := Y
-CCFLAGS_WARNINGS = -Wall -pedantic -Wno-sign-compare
-CC_FLAGS_OSE = -DSPARC -DSIM -DOSE_DELTA -DMP 
-CCFLAGS_TOP = $(CC_FLAGS_OSE) $(CC_FLAGS_WARNINGS) -DNDB_STRDUP
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O3
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O3 -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-
-CCFLAGS_LOC_OSE= -I/vobs/cello/cls/rtosi_if/include.sparc
-
-
-CCFLAGS = $(CCFLAGS_LOC_OSE) $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC_OSE) $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDLIBS_LOC = -L$(NDB_TOP)/lib -L$(OSE_LOC)/sfk-solaris2/lib -L$(OSE_LOC)/sfk-solaris2/krn-solaris2/lib 
-
-LDLIBS_TOP = 
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC)  $(LDFLAGS)
-
-
-

ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk

-###
-#
-# Defines
-SHELL      := /bin/sh
-
-C++        := g++ 
-CC         := gcc
-AR_RCS     := $(PURE) ar rcs 
-SO         := g++ -shared -o
-
-MAKEDEPEND := g++ -M
-PIC        := -fPIC
-
-###
-#
-# Flags
-# 
-NDB_STRDUP := Y
-CCFLAGS_WARNINGS = -Wno-long-long -Wall -pedantic -Wno-sign-compare -ansi
-CC_FLAGS_OSE = -DUSE_OSEDEF_H -DOSE_DELTA -DOS_DEBUG -DBIG_ENDIAN
-CCFLAGS_TOP = $(CC_FLAGS_OSE) $(CC_FLAGS_WARNINGS) -DNDB_STRDUP
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O3
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O3 -g
-else
-VERSION_FLAGS += -g -DOS_DEBUG
-endif
-endif
-
-OSE_LOC = /opt/as/OSE/OSE4.3.1
-
-CCFLAGS_LOC_OSESTD = -I$(OSE_LOC)/sfk-solaris2/std-include
-CCFLAGS_LOC_OSE = -I$(OSE_LOC)/sfk-solaris2/include -I$(OSE_LOC)/sfk-solaris2/krn-solaris2/include -I$(NDB_TOP)/src/env/softose 
-
-
-CCFLAGS = $(CCFLAGS_LOC_OSE) $(CCFLAGS_LOC_OSESTD) $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC_OSE) $(CCFLAGS_LOC_OSESTD) $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDLIBS_LOC = -L$(NDB_TOP)/lib -L$(OSE_LOC)/sfk-solaris2/lib -L$(OSE_LOC)/sfk-solaris2/krn-solaris2/lib 
-
-LDLIBS_TOP = 
-
-LDLIBS_LAST = -lsoftose_env -lsoftose_krn -llnh -lefs -lshell -lfss -ltosv -lrtc -lheap -linetutil -linetapi -lsoftose -lsoftose_env -lsoftose_krn -losepthread -lrtc -lnsl -lsocket -lpthread -lcrt -lm  
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC)  $(LDFLAGS)
-
-
-

ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk

-###
-#
-# Defines
-SHELL      := /bin/sh
-
-C++        := CC
-CC         := /opt/as/forte6/SUNWspro/bin/cc
-AR_RCS     := $(PURE) CC -xar -o
-SO         := CC -G -z text  -o
-
-MAKEDEPEND := CC -xM1
-PIC        := -KPIC
-ETAGS       := etags
-CTAGS       := ctags
-
-RPCGENFLAGS := -MA -C -N
-
-###
-#
-# Flags
-
-CCFLAGS_TOP = -mt -DSOLARIS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-
-ifneq ($(PURE),)
-	CCFLAGS_TOP += -xs
-	CCFLAGS_TOP += -DNDB_PURIFY
-endif
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -xO3
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -xO3 -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) 
-
-LDFLAGS_TOP = -L/opt/as/forte6/SUNWspro/WS6/lib -lpthread -lsocket -lnsl -lrt
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) -xildoff $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)
-
-
-
-

ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk

-###
-#
-# Defines
-SHELL      := /bin/sh
-
-CXX        := gcc 
-C++        := g++ 
-CC         := gcc
-AR_RCS     := ar rcs 
-SO         := gcc -G -o
-
-#GXX_VERSION := $(shell gcc --version | sed -e 's,.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*,\1,1' -e q)
-
-MAKEDEPEND := g++ -M
-PIC        := -fPIC
-
-RPCGENFLAGS := -MA -C -N
-ETAGS       := etags
-CTAGS       := ctags
-
-###
-#
-# Flags
-# 
-CCFLAGS_WARNINGS = -Wno-long-long -W -Wall -pedantic 
-# -Wno-sign-compare Use this flag if you are annoyed with all the warnings
-CCFLAGS_TOP = -DSOLARIS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DNO_COMMAND_HANDLER
-CCFLAGS_TOP += -fno-rtti
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O2
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O2 -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDFLAGS_TOP =
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(CXX) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)
-
-LDFLAGS_LAST = -lpthread -lsocket -lnsl -lrt -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
-

ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk

-###
-#
-# Note: LD_LIBRARY_PATH must be set for /usr/local/lib/sparcv9 to dynamically link
-# to 64-bit libraries
-# 
-# Defines
-SHELL      := /bin/sh
-
-C++        := g++ -m64
-CC         := gcc -m64
-AR_RCS     := ar rcs 
-SO         := g++ -m64 -shared -o
-
-MAKEDEPEND := g++ -M
-PIC        := -fPIC
-
-RPCGENFLAGS := -MA -C -N
-ETAGS       := etags
-CTAGS       := ctags
-
-###
-#
-# Flags
-# 
-CCFLAGS_WARNINGS = -Wno-long-long -W -Wall -pedantic 
-# -Wno-sign-compare Use this flag if you are annoyed with all the warnings
-CCFLAGS_TOP = -DSOLARIS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DNO_COMMAND_HANDLER
-CCFLAGS_TOP += -fno-rtti
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O2
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O2 -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDFLAGS_TOP = -lpthread -lsocket -lnsl -lrt
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)
-
-

ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk

-###
-#
-# Defines
-SHELL      := /bin/sh
-
-C++        := g++ 
-CC         := gcc
-AR_RCS     := $(PURE) ar rcs 
-SO         := g++ -shared -o
-
-MAKEDEPEND := g++ -M
-PIC        := -fPIC
-
-RPCGENFLAGS := -MA -C -N
-
-###
-#
-# Flags
-# 
-CCFLAGS_WARNINGS = -Wno-long-long -Wall -pedantic 
-# -Wno-sign-compare Use this flag if you are annoyed with all the warnings
-CCFLAGS_TOP = -DSOLARIS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DNO_COMMAND_HANDLER
-
-# SOLARIS 6 should use the same settings as SOLARIS7
-# if something in the SOLARIS 7 port does not work for SOLARIS 6
-# it can be ifdefed using 
-# if ! defined NDB_SOLRIS6
-CCFLAGS_TOP = -DNDB_SOLARIS
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O3
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O3
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDFLAGS_TOP = -lpthread -lsocket -lnsl -lposix4
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)
-
-

ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk

-###
-#
-# Defines
-SHELL       := /bin/sh
-
-C++         := g++ 
-CC          := gcc
-AR_RCS      := $(PURE) ar rcs 
-SO          := g++ -shared -o
-
-MAKEDEPEND  := g++ -M
-PIC         := -fPIC
-
-RPCGENFLAGS := -M -C -N
-
-ETAGS       := etags
-CTAGS       := ctags
-
-###
-#
-# Flags
-# 
-CCFLAGS_WARNINGS = -Wno-long-long -Wall #-pedantic
-# Add these for more warnings -Weffc++ -W
-CCFLAGS_TOP = -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-CCFLAGS_TOP += -fno-rtti
-
-ifeq (RELEASE, $(NDB_VERSION))
-VERSION_FLAGS += -O3
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-VERSION_FLAGS += -O3 -g
-else
-VERSION_FLAGS += -g
-endif
-endif
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDFLAGS_TOP = -lpthread -lrt
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-LINK.cc = $(PURE) $(C++) $(CCFLAGS) $(LDFLAGS)
-
-LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)

ndb/config/old_files/Defs.WIN32.x86.VC7.mk

-###
-#
-# Defines
-SHELL       := /bin/sh
-
-
-DEFINES     = -D_WIN32 -D_M_IX86=600 -D_MSC_EXTENSIONS=0 -U_cdecl -D_MT 
-# 
-MAKEDEPEND  = g++ -M --nostdinc --nostdinc++ -I"`cygpath -u "$(MSVCDIR)\include"`" -I"`cygpath -u "$(MSVCDIR)\PlatformSDK\include"`" $(DEFINES)
-PIC         = -D_LIB
-NON_PIC     = -D_LIB
-
-RPCGENFLAGS := -M -C -N
-
-ETAGS       := etags
-CTAGS       := ctags
-
-###
-#
-# Flags
-# 
-CCFLAGS_WARNINGS	= 
-CCFLAGS_TOP		= 
-CCFLAGS_LOC		= 
-CCFLAGS_WIN		= -DWIN32 -D_WIN32_WINNT=0x0500 -DWINVER=0x0500 -D_MBCS -DNO_COMMAND_HANDLER
-CCFLAGS_WIN		+= -W3 -EHsc
-#CCFLAGS_WIN		+= -clr 
-
-ifeq (RELEASE, $(NDB_VERSION))
-CCFLAGS_WIN		+= -MT -O2 -Ob1 -DNO_DEBUG_MESSAGES
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-CCFLAGS_WIN		+= -MT -O2 -Ob1 -DNO_DEBUG_MESSAGES
-else
-CCFLAGS_WIN		+= -MTd -Zi -Od -GS -D_DEBUG
-endif
-endif
-
-C++         = cl -nologo $(CCFLAGS_WIN)
-CC          = cl -nologo $(CCFLAGS_WIN)
-
-CCFLAGS = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS)
-CFLAGS  = $(CCFLAGS_LOC) $(CCFLAGS_TOP) $(USER_FLAGS) $(VERSION_FLAGS) $(CCFLAGS_WARNINGS) 
-
-LDFLAGS_TOP = 
-
-LDFLAGS = $(LDFLAGS_LOC) $(LDFLAGS_TOP)
-
-LDLIBS = $(LDLIBS_LOC) $(LDLIBS_TOP)
-
-WIN_LIBS := Ws2_32.lib Advapi32.lib
-
-ifeq (RELEASE, $(NDB_VERSION))
-LINK.cc = link -INCREMENTAL:NO -NOLOGO -LARGEADDRESSAWARE $(WIN_LIBS)
-else
-ifeq (RELEASE_TRACE, $(NDB_VERSION))
-LINK.cc = link -INCREMENTAL:NO -NOLOGO -LARGEADDRESSAWARE $(WIN_LIBS)
-else
-LINK.cc = link -INCREMENTAL -NOLOGO -DEBUG -LARGEADDRESSAWARE $(WIN_LIBS)
-endif
-endif

ndb/config/old_files/GuessConfig.sh

-#! /bin/sh
-
-if [ -z "$NDB_TOP" ]
-then
-	echo "You have not set NDB_TOP. Exiting" 1>&2
-	exit 1
-fi
-
-if [ -z "$NDB_SCI" ]
-then
-	NDB_SCI=N
-fi
-
-if [ -z "$NDB_SHM" ]
-then
-	NDB_SHM=N
-fi
-
-os=`uname -s`
-case $os in
-Linux)
-	NDB_OS=LINUX
-	NDB_ARCH=x86
-	NDB_COMPILER=GCC
-	;;
-Darwin)
-	NDB_OS=MACOSX
-	NDB_ARCH=POWERPC
-	NDB_COMPILER=GCC
-	;;
-HP-UX)
-	NDB_OS=HPUX
-	NDB_ARCH=HPPA
-	NDB_COMPILER=GCC
-	;;
-CYGWIN_NT-5.0)
-	NDB_OS=WIN32
-	NDB_ARCH=x86
-	NDB_COMPILER=VC7
-	;;
-*)
-	if [ "$os" = "SunOS" ] && [ `uname -r` = "5.6" ]
-	then
-		NDB_OS=OSE
-		NDB_ARCH=PPC750
-		NDB_COMPILER=DIAB
-	else
-		NDB_OS=SOLARIS
-		NDB_ARCH=SPARC
-		NDB_COMPILER=GCC
-	fi;;
-esac
-
-if [ -z "$NDB_ODBC" ]
-then
-  NDB_ODBC=N
-fi
-
-
-mch=`uname -m`
-case $mch in
-x86_64)
-	NDB_ARCH=x86_64
-	;;
-*)
-	;;
-esac
-
-if [ -f $NDB_TOP/config/Makefile ]
-then
-TERMCAP_LIB=`grep TERMCAP_LIB $NDB_TOP/config/Makefile | sed -e s,"TERMCAP_LIB.*=.*-l","",g`
-fi
-if [ "$TERMCAP_LIB" = "" ]
-then
-TERMCAP_LIB=termcap
-fi
-
-# defaults
-NDB_VERSION=DEBUG
-PACKAGE=
-VERSION=
-
-parse_arguments() {
-  for arg do
-    case "$arg" in
-      -GCC)       NDB_COMPILER=GCC ;;
-      -R)         NDB_VERSION=RELEASE ;;
-      -D)         NDB_VERSION=DEBUG ;;
-      --PACKAGE=*) PACKAGE=`echo "$arg" | sed -e "s;--PACKAGE=;;"` ;;
-      --VERSION=*) VERSION=`echo "$arg" | sed -e "s;--VERSION=;;"` ;;
-      *)
-        echo "Unknown argument '$arg'"
-        exit 1
-        ;;
-    esac
-  done
-}
-
-parse_arguments "$@"
-
-(
-	echo "# This file was automatically generated `date`"
-	echo "NDB_OS       := $NDB_OS"
-	echo "NDB_ARCH     := $NDB_ARCH"
-	echo "NDB_COMPILER := $NDB_COMPILER"
-	echo "NDB_VERSION  := $NDB_VERSION"
-	echo "NDB_SCI      := $NDB_SCI"
-	echo "NDB_SHM      := $NDB_SHM"
-	echo "NDB_ODBC     := $NDB_ODBC"
-	echo "TERMCAP_LIB  := $TERMCAP_LIB"
-	echo "PACKAGE      := $PACKAGE"
-	echo "VERSION      := $VERSION"
-) > $NDB_TOP/config/config.mk
-
-exit 0
-

ndb/config/old_files/Makefile.am

-# Copyright (C) 2003 MySQL AB
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-# Process this file with automake to create Makefile.in
-
-AUTOMAKE_OPTIONS =	foreign
-
-# These are built from source in the Docs directory
-EXTRA_DIST =		
-SUBDIRS =		
-
-# Relink after clean
-linked_sources = 
-
-CLEANFILES = $(linked_sources)
-
-# This is just so that the linking is done early.
-config.h:

ndb/include/Makefile.am

@@ -22,8 +22,6 @@ ndbapi/NdbReceiver.hpp \
 ndbapi/NdbResultSet.hpp \
 ndbapi/NdbScanFilter.hpp \
 ndbapi/NdbScanOperation.hpp \
-ndbapi/NdbSchemaCon.hpp \
-ndbapi/NdbSchemaOp.hpp \
 ndbapi/ndberror.h
 
 mgmapiinclude_HEADERS = \

ndb/include/ndbapi/NdbDictionary.hpp

@@ -298,6 +298,11 @@ public:
      */
     int getLength() const;
         
+    /**
+     * Get size of element
+     */
+    int Column::getSize() const;
+
     /** 
      * Set distribution key
      *
@@ -349,6 +354,7 @@ public:
 #endif
     
   private:
+    friend class NdbRecAttr;
     friend class NdbColumnImpl;
     class NdbColumnImpl & m_impl;
     Column(NdbColumnImpl&);
@@ -1030,4 +1036,6 @@ public:
   };
 };
 
+class NdbOut& operator <<(class NdbOut& ndbout, const NdbDictionary::Column::Type type);
+
 #endif

ndb/include/ndbapi/NdbRecAttr.hpp

@@ -20,7 +20,6 @@
 #include <NdbDictionary.hpp>
 
 class NdbOperation;
-class AttrInfo;
 
 /**
  * @class NdbRecAttr
@@ -77,6 +76,7 @@ class NdbRecAttr
   friend class NdbEventOperationImpl;
   friend class NdbScanReceiver;
   friend class Ndb;
+  friend class NdbOut& operator<<(class NdbOut&, const class AttributeS&);
 
 public:
   /** 
@@ -254,6 +254,7 @@ private:
   void next(NdbRecAttr* aRecAttr);
   NdbRecAttr* next() const;
 
+  int setup(const class NdbDictionary::Column* col, char* aValue);
   int setup(const class NdbColumnImpl* anAttrInfo, char* aValue);
                                 /* Set up attributes and buffers        */
   bool copyoutRequired() const; /* Need to copy data to application     */

ndb/old_files/BinDist.sh

-#
-# Invoked from scripts/make_binary_distribution as "sh BinDist.sh".
-# Prints list of dirs and files to include under mysql/ndb.
-#
-
-# release notes
-
-grep -v '^#' <<__END__
-#ReleaseNotes.html
-mysqlclusterenv.sh
-__END__
-
-# subset of bins, libs, includes
-
-grep -v '^#' <<__END__
-bin/
-bin/ndb
-bin/mgmtsrvr
-bin/mgmtclient
-bin/mysqlcluster
-bin/mysqlcluster_install_db
-bin/mysqlclusterd
-bin/restore
-bin/ndb_rep
-bin/desc
-bin/flexBench
-bin/select_all
-bin/select_count
-bin/delete_all
-#bin/ndbsql
-bin/drop_tab
-bin/drop_index
-bin/list_tables
-bin/waiter
-lib/
-lib/libNEWTON_API.a
-lib/libNEWTON_API.so
-lib/libNDB_API.a
-lib/libNDB_API.so
-lib/libMGM_API.a
-lib/libMGM_API.so
-#lib/libNDB_ODBC.so
-lib/libMGM_API_pic.a
-lib/libNDB_API_pic.a
-include/
-include/ndb_types.h
-include/ndb_version.h
-include/mgmapi/
-include/mgmapi/mgmapi.h
-include/mgmapi/mgmapi_debug.h
-include/ndbapi/
-include/ndbapi/ndbapi_limits.h
-include/ndbapi/Ndb.hpp
-include/ndbapi/NdbApi.hpp
-include/ndbapi/NdbConnection.hpp
-include/ndbapi/NdbCursorOperation.hpp
-include/ndbapi/NdbDictionary.hpp
-include/ndbapi/NdbError.hpp
-include/ndbapi/NdbEventOperation.hpp
-include/ndbapi/NdbIndexOperation.hpp
-include/ndbapi/NdbOperation.hpp
-include/ndbapi/NdbPool.hpp
-include/ndbapi/NdbRecAttr.hpp
-include/ndbapi/NdbReceiver.hpp
-include/ndbapi/NdbResultSet.hpp
-include/ndbapi/NdbScanFilter.hpp
-include/ndbapi/NdbScanOperation.hpp
-include/ndbapi/NdbSchemaCon.hpp
-include/ndbapi/NdbSchemaOp.hpp
-include/newtonapi/dba.h
-include/newtonapi/defs/pcn_types.h
-__END__
-
-#if [ -f /usr/local/lib/libstdc++.a ]; then
-#  cp /usr/local/lib/libstdc++.a lib/.
-#  echo lib/libstdc++.a
-#fi
-#if [ -f /usr/local/lib/libstdc++.so.5 ]; then
-#  cp /usr/local/lib/libstdc++.so.5 lib/.
-#  echo lib/libstdc++.so.5
-#fi
-#if [ -f /usr/local/lib/libgcc_s.so.1 ]; then
-#  cp /usr/local/lib/libgcc_s.so.1 lib/.
-#  echo lib/libgcc_s.so.1
-#fi
-
-# docs
-
-#find docs/*.html docs/*.pdf -print | sort -t/
-
-# demos
-
-find demos -print | grep -v /SCCS | sort -t/
-
-# examples
-
-grep -v '^#' <<__END__
-examples/
-examples/Makefile
-examples/ndbapi_example1/
-examples/ndbapi_example1/Makefile
-examples/ndbapi_example1/ndbapi_example1.cpp
-examples/ndbapi_example2/
-examples/ndbapi_example2/Makefile
-examples/ndbapi_example2/ndbapi_example2.cpp
-examples/ndbapi_example3/
-examples/ndbapi_example3/Makefile
-examples/ndbapi_example3/ndbapi_example3.cpp
-examples/ndbapi_example4/
-examples/ndbapi_example4/Makefile
-examples/ndbapi_example4/ndbapi_example4.cpp
-examples/ndbapi_example5/
-examples/ndbapi_example5/Makefile
-examples/ndbapi_example5/ndbapi_example5.cpp
-examples/select_all/
-examples/select_all/Makefile
-examples/select_all/select_all.cpp
-__END__
-
-exit 0

ndb/old_files/Defs.mk

-include $(NDB_TOP)/config/config.mk
-include $(NDB_TOP)/config/Defs.$(NDB_VERSION).mk
-include $(NDB_TOP)/config/Defs.$(NDB_OS).$(NDB_ARCH).$(NDB_COMPILER).mk
-
-ifeq ($(NDB_OS), WIN32)
-# Windows specific definitions
-OBJEXT    := obj
-LIBEXT    := lib
-LIBPREFIX :=
-fixpath   = `cygpath -w $1`
-ar_rcs    = lib -out:`cygpath -w $1` $2
-link_so   = link -DLL -OUT:`cygpath -w $1` $(WIN_LIBS) $2
-#check-odbc = Y
-USE_EDITLINE := N
-#STRCASECMP is defined in include/portlib/PortDefs.h to _strcmpi
-else
-#Common definitions for almost all non-Windows environments
-OBJEXT    := o
-LIBEXT    := a
-LIBPREFIX := lib
-fixpath   = $1
-ar_rcs    = $(AR_RCS) $1 $2
-#check-odbc = $(findstring sqlext.h, $(wildcard /usr/include/sqlext.h) $(wildcard /usr/local/include/sqlext.h))
-endif
-
-ifeq ($(NDB_OS), WIN32)
-SHLIBEXT  := dll
-endif
-
-ifeq ($(NDB_OS), LINUX)
-SHLIBEXT  := so
-endif
-
-ifeq ($(NDB_OS), SOLARIS)
-SHLIBEXT  := so
-endif
-
-ifeq ($(NDB_OS), HPUX)
-SHLIBEXT := sl
-endif
-
-ifeq ($(NDB_OS), MACOSX)
-SHLIBEXT := dylib
-endif
-
-ifeq ($(NDB_OS), OSE)
-SHLIBEXT := so
-endif
-
-ifeq ($(NDB_OS), SOFTOSE)
-SHLIBEXT := so
-endif
-
-ifeq ($(NDB_SCI), Y)
-CCFLAGS_TOP += -DHAVE_NDB_SCI
-endif
-
-ifeq ($(NDB_SHM), Y)
-CCFLAGS_TOP += -DHAVE_NDB_SHM
-endif
-
-ifneq ($(findstring OSE, $(NDB_OS)),)
-USE_EDITLINE := N
-endif

ndb/old_files/Makefile

-include .defs.mk
-
-DIRS := src test tools examples
-
-# hack before full autoconf
-replace-targets := all clean
-NDB_RELEASE := $(shell ../scripts/mysql_config --version)
-
-all:
-	$(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
-
-_libs_test : _bins_src
-_libs_tools : _libs_test
-_libs_examples : _bins_src
-_bins_src : _libs_src
-_bins_tools : _bins_src
-
-# always release compile except for ndbapi static lib
-old-all:
-	$(MAKE) -C src/ndbapi libs
-	$(MAKE) libs NDB_VERSION=RELEASE
-	$(MAKE) bins NDB_VERSION=RELEASE
-ifeq ($(NDB_OS),LINUX)
-	NDB_RELEASE=$(NDB_RELEASE) $(MAKE) -j1 -C docs all </dev/null || :
-endif
-
-# old distclean matches clean better
-clean: distclean
-	$(MAKE) -C docs clean
-
-nuke-deps:
-	find . -name '.depend*' | xargs rm -rf
-
-vim-tags:
-	bk sfiles -g | ctags --c-types=+p --extra=+fq -L -
-
-cvs-update:
-ifeq ($(NDB_VERSION),main)
-	-cvs update -d
-else
-ifeq ($(NDB_TAG),HEAD)
-	-cvs -q update
-	-cd include && cvs -q update -d
-	-cd src && cvs -q update -d
-	-cd test && cvs -q update -d
-	-cd tools && cvs -q update -d
-else
-	-cvs -q update -r $(NDB_TAG)
-	-cd include && cvs -q update -d -r $(NDB_TAG)
-	-cd src && cvs -q update -d -r $(NDB_TAG)
-	-cd test && cvs -q update -d -r $(NDB_TAG)
-	-cd tools && cvs -q update -d -r $(NDB_TAG)
-endif
-endif
-	make nuke-deps
-	make vim-tags
-	make TAGS
-
-bk-update:
-	bk pull
-	make nuke-deps
-	make vim-tags
-	make TAGS

ndb/old_files/README

-INSTALLATION
-To compile a pentium version of MySQL Cluster from this BK clone do:
-
-shell> cd /home/bk/mysql-4.1-ndb
-shell> BUILD/compile-pentium-debug -c --prefix=/usr/local/mysql-4.1-ndb
-shell> make 
-

ndb/old_files/SrcDist.sh

-#
-# Invoked from make distdir.
-# Prints list of dirs and files to include under mysql/ndb.
-#
-
-# top dir
-
-grep -v '^#' <<__END__
-#ReleaseNotes.html
-.defs.mk
-Defs.mk
-configure
-Makefile
-Epilogue.mk
-SrcDist.sh
-BinDist.sh
-mysqlclusterenv.sh
-__END__
-
-# subset of bins, libs
-
-grep -v '^#' <<__END__
-bin/
-bin/mysqlcluster
-bin/mysqlcluster_install_db
-bin/mysqlclusterd
-lib/
-__END__
-
-# docs
-
-#find docs/*.html docs/*.pdf -print 
-
-# include
-
-find include -print | grep -v /SCCS 
-
-# config
-
-find config -print | grep -v /SCCS 
-
-# tools
-
-find tools -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend' | grep -v tools/ndbsql 
-
-# home
-
-find home -print | grep -v /SCCS 
-
-# test
-
-find test -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend' | grep -v test/odbc 
-
-# src
-
-find src -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend' | grep -v src/client/odbc | grep -v cpcc-win32 
-
-# demos
-
-find demos -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend' 
-
-# examples
-
-grep -v '^#' <<__END__
-examples/
-examples/Makefile
-examples/ndbapi_example1/
-examples/ndbapi_example1/Makefile
-examples/ndbapi_example1/ndbapi_example1.cpp
-examples/ndbapi_example2/
-examples/ndbapi_example2/Makefile
-examples/ndbapi_example2/ndbapi_example2.cpp
-examples/ndbapi_example3/
-examples/ndbapi_example3/Makefile
-examples/ndbapi_example3/ndbapi_example3.cpp
-examples/ndbapi_example4/
-examples/ndbapi_example4/Makefile
-examples/ndbapi_example4/ndbapi_example4.cpp
-examples/ndbapi_example5/
-examples/ndbapi_example5/Makefile
-examples/ndbapi_example5/ndbapi_example5.cpp
-examples/select_all/
-examples/select_all/Makefile
-examples/select_all/select_all.cpp
-__END__
-
-exit 0

ndb/old_files/configure

-#! /bin/sh
-
-if [ $# -gt 0 -a "$1" = "-p" ]
-then
-	shift
-	NDB_TOP=$1
-	shift
-else
-	NDB_TOP=`pwd`
-fi
-
-cd $NDB_TOP
-NDB_TOP=`pwd`
-
-for i in `find . -name 'Makefile' -exec dirname {} \;`
-do
-    cd $i
-    rel_path=.
-    while [ $NDB_TOP != `pwd` ]
-    do
-	rel_path=$rel_path"/.."
-	cd ..
-    done
-
-    (
-		echo "NDB_TOP=$rel_path"
-		echo "include $rel_path/Defs.mk"
-    ) > $i/.defs.mk
-done
-
-( cd config ; aclocal ; automake ; aclocal ; autoconf ; ./configure )
-export NDB_TOP
-. config/GuessConfig.sh  $*

ndb/old_files/env.sh

-#
-
-NDB_TOP=`pwd`
-export NDB_TOP
-
-NDB_PROJ_HOME=$NDB_TOP/home
-export NDB_PROJ_HOME
-

ndb/old_files/mysqlclusterenv.sh

-# Sets necessary environment variables for mysqlcluster install scripts
-mytop=
-if [ -f bin/mysql ]; then
-	mytop=`/bin/pwd`
-elif [ -f bin/ndb ]; then
-	mytop=`dirname \`/bin/pwd\``
-fi
-if [ "$mytop" ]; then
-	MYSQLCLUSTER_TOP=$mytop
-	PATH=$MYSQLCLUSTER_TOP/bin:$MYSQLCLUSTER_TOP/ndb/bin:$PATH
-	LD_LIBRARY_PATH=$MYSQLCLUSTER_TOP/lib:$LD_LIBRARY_PATH
-	LD_LIBRARY_PATH=$MYSQLCLUSTER_TOP/ndb/lib:$LD_LIBRARY_PATH
-	export MYSQLCLUSTER_TOP PATH LD_LIBRARY_PATH
-else
-if [ -d SCCS ]; then
-if [ -f ndb/mysqlclusterenv.sh ]; then
-	mytop=`/bin/pwd`
-elif [ -f mysqlclusterenv.sh ]; then
-	mytop=`dirname \`/bin/pwd\``
-fi
-fi
-if [ "$mytop" ]; then
-# we're in the development tree
-    if [ "$REAL_EMAIL" ]; then :; else
-#Guessing REAL_EMAIL
-    REAL_EMAIL=`whoami`@mysql.com
-    export REAL_EMAIL
-    echo Setting REAL_EMAIL=$REAL_EMAIL
-    fi
-
-    MYSQLCLUSTER_TOP=$mytop
-
-    NDB_TOP=$MYSQLCLUSTER_TOP/ndb
-    export NDB_TOP
-
-    NDB_PROJ_HOME=$NDB_TOP/home
-    export NDB_PROJ_HOME
-
-    PATH=$MYSQLCLUSTER_TOP/ndb/bin:$MYSQLCLUSTER_TOP/ndb/home/bin:$PATH
-    PATH=$MYSQLCLUSTER_TOP/client:$PATH
-    PATH=$MYSQLCLUSTER_TOP/sql:$PATH
-    LD_LIBRARY_PATH=$MYSQLCLUSTER_TOP/libmysql:$LD_LIBRARY_PATH
-    LD_LIBRARY_PATH=$MYSQLCLUSTER_TOP/libmysqld:$LD_LIBRARY_PATH
-    LD_LIBRARY_PATH=$MYSQLCLUSTER_TOP/ndb/lib:$LD_LIBRARY_PATH
-    LD_LIBRARY_PATH=$MYSQLCLUSTER_TOP/libmysql_r/.libs:$LD_LIBRARY_PATH
-    export MYSQLCLUSTER_TOP PATH LD_LIBRARY_PATH
-else
-	echo "Please source this file (mysqlclusterenv.sh) from installation top directory"
-fi
-fi
-mytop=

ndb/src/kernel/blocks/backup/restore/Restore.hpp

@@ -20,7 +20,6 @@
 #include <ndb_global.h>
 #include <BackupFormat.hpp>
 #include <NdbApi.hpp>
-#include <NdbSchemaCon.hpp>
 #include "myVector.hpp"
 
 #include <ndb_version.h>
@@ -62,29 +61,22 @@ struct AttributeData {
 
 struct AttributeDesc {
   //private:
-  // TODO (sometimes): use a temporary variable in DTIMAP so we can
-  //                   hide AttributeDesc private variables
   friend class TupleS;
   friend class TableS;
   friend class RestoreDataIterator;
   friend class RestoreMetaData;
   friend struct AttributeS;
-  char name[AttrNameLenC];
-  Uint32 attrId;
-  AttrType type;
-  bool nullable;
-  KeyType key; 
   Uint32 size; // bits       
   Uint32 arraySize;
+  Uint32 attrId;
+  NdbDictionary::Column *m_column;
 
   Uint32 m_nullBitIndex;
 public:
   
-  AttributeDesc() {
-    name[0] = 0;
-  } 
+  AttributeDesc(NdbDictionary::Column *column);
+  AttributeDesc();
 
-  const TableS * m_table;
   Uint32 getSizeInWords() const { return (size * arraySize + 31)/ 32;}
 }; // AttributeDesc
 
@@ -118,8 +110,6 @@ class TableS {
   friend class RestoreMetaData;
   friend class RestoreDataIterator;
   
-  Uint32 tableId;
-  char tableName[TableNameLenC];
   Uint32 schemaVersion;
   Uint32 backupVersion;
   myVector<AttributeDesc *> allAttributesDesc;
@@ -138,26 +128,14 @@ class TableS {
   char mysqlDatabaseName[1024];
   */
 
-  void createAttr(const char* name, 
-		  const AttrType type, 
-		  const unsigned int size, // in bits 
-		  const unsigned int arraySize, 
-		  const bool nullable,
-		  const KeyType key);
+  void createAttr(NdbDictionary::Column *column);
 
 public:
   class NdbDictionary::Table* m_dictTable;
-  TableS (const char * name){
-    snprintf(tableName, sizeof(tableName), name);
-    m_noOfNullable = m_nullBitmaskSize = 0;
-  }
-
-  void setTableId (Uint32 id) { 
-    tableId = id; 
-  }
+  TableS (class NdbTableImpl* dictTable);
 
   Uint32 getTableId() const { 
-    return tableId; 
+    return m_dictTable->getTableId(); 
   }
   /*
   void setMysqlTableName(char * tableName) {
@@ -175,7 +153,6 @@ public:
     backupVersion = version;
   }
   
-  
   Uint32 getBackupVersion() const { 
     return backupVersion;
   }

ndb/src/ndbapi/Makefile.am

@@ -31,8 +31,6 @@ libndbapi_la_SOURCES = \
         NdbEventOperationImpl.cpp   \
         NdbApiSignal.cpp        \
         NdbRecAttr.cpp  \
-        NdbSchemaCon.cpp        \
-        NdbSchemaOp.cpp \
         NdbUtil.cpp \
         NdbReceiver.cpp \
         NdbDictionary.cpp \

ndb/src/ndbapi/Ndberr.cpp

@@ -18,7 +18,6 @@
 #include <NdbError.hpp>
 #include "NdbImpl.hpp"
 #include "NdbDictionaryImpl.hpp"
-#include <NdbSchemaCon.hpp>
 #include <NdbOperation.hpp>
 #include <NdbConnection.hpp>
 
@@ -66,10 +65,3 @@ NdbOperation::getNdbError() const {
   update(theError);
   return theError;
 }
-
-const 
-NdbError & 
-NdbSchemaCon::getNdbError() const {
-  update(theError);
-  return theError;
-}

ndb/src/old_files/Makefile

-include .defs.mk
-
-DIRS := \
-        client \
-        common  \
-        kernel  \
-        ndbapi  \
-	mgmsrv  \
-        mgmapi  \
-	newtonapi \
-	rep \
-        mgmclient \
-        cw \
-        ndbbaseclient
-ifneq ($(NDB_ODBC),N)
-        DIRS += ndbclient
-endif
-ifeq ($(findstring OSE, $(NDB_OS)),)
-	DIRS += scripts 
-endif
-include $(NDB_TOP)/Epilogue.mk
-
-_bins_mgmsrv: _libs_ndbapi
-_bins_mgmsrv: _libs_mgmapi
-_bins_mgmclient: _libs_mgmapi
-_bins_mgmclient: _libs_common
-_bins_client: _bins_ndbapi
-_bins_common: _bins_mgmapi
-_bins_kernel: _bins_ndbapi
-_bins_newtonapi: _bins_ndbapi
-_bins_mgmapi : _libs_common
-_bins_rep: _libs_common
-_bins_rep: _libs_ndbapi

ndb/test/Makefile_old

-include .defs.mk
-
-DIRS := src tools ndbapi run-test
-
-EXTRA_DIRS = newtonapi
-
-ifeq ($(NDB_ARCH), x86_64)
-EXTRA_DIRS = 
-endif
-
-DIRS += $(EXTRA_DIRS)
-
-ifneq ($(NDB_ODBC),N)
-DIRS += odbc
-endif
-
-include $(NDB_TOP)/Epilogue.mk
-
-_bins_ndbapi : _libs_src