diff --git a/acinclude.m4 b/acinclude.m4 index 677c3cc9e99..60b53ec39d5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1355,7 +1355,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ AC_DEFINE(HAVE_NDBCLUSTER_DB) have_ndbcluster="yes" ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi" - ndbcluster_libs="\$(top_builddir)/ndb/lib/libNDB_API.a" + ndbcluster_libs="\$(top_builddir)/ndb/src/ndbapi/libNDB_API.la" ndbcluster_system_libs="" ;; * ) diff --git a/configure.in b/configure.in index b29297ecdbb..2e0dceaef01 100644 --- a/configure.in +++ b/configure.in @@ -1615,15 +1615,19 @@ then # Medium debug. CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS" CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS" + #NDB_DEFS="-DNDB_RELEASE -DUSE_EMULATED_JAM -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" + NDB_DEFS="-DNDB_DEBUG -DUSE_EMULATED_JAM -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" elif test "$with_debug" = "full" then # Full debug. Very slow in some cases CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" + NDB_DEFS="-DNDB_DEBUG -DUSE_EMULATED_JAM -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" else # Optimized version. No debug CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS" CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS" + NDB_DEFS="-DNDB_RELEASE -DUSE_EMULATED_JAM -DNDEBUG" fi # Force static compilation to avoid linking problems/get more speed @@ -2763,15 +2767,6 @@ EOF exit 1 fi sql_server_dirs="$sql_server_dirs ndb" - echo "CONFIGURING FOR NDB CLUSTER" - case $with_debug in - no) flag="-R" ;; - *) flag="-D" ;; - esac - flag="$flag --VERSION=$VERSION --PACKAGE=$PACKAGE" - (cd ndb && ./configure $flag) \ - || AC_MSG_ERROR([could not configure NDB Cluster]) - echo "END OF NDB CLUSTER CONFIGURATION" fi # # END of configuration for optional table handlers @@ -2834,14 +2829,122 @@ case $SYSTEM_TYPE in MAKE_BINARY_DISTRIBUTION_OPTIONS= ;; esac + if test X"$have_ndbcluster" = Xyes then MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" + + CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" fi + + NDB_UTIL_INCLUDES="-I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \ + -I\$(top_srcdir)/ndb/include/util \ + -I\$(top_srcdir)/ndb/include/portlib \ + -I\$(top_srcdir)/ndb/include/logger" + NDB_KERNEL_INCLUDES="\ + -I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \ + -I\$(top_srcdir)/ndb/src/kernel/vm \ + -I\$(top_srcdir)/ndb/src/kernel/error \ + -I\$(top_srcdir)/ndb/src/kernel \ + -I\$(top_srcdir)/ndb/include/kernel \ + -I\$(top_srcdir)/ndb/include/transporter \ + -I\$(top_srcdir)/ndb/include/debugger \ + -I\$(top_srcdir)/ndb/include/mgmcommon \ + -I\$(top_srcdir)/ndb/include/ndbapi \ + -I\$(top_srcdir)/ndb/include/util \ + -I\$(top_srcdir)/ndb/include/portlib \ + -I\$(top_srcdir)/ndb/include/logger" + NDB_NDBAPI_INCLUDES="\ + -I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \ + -I\$(top_srcdir)/ndb/include/kernel \ + -I\$(top_srcdir)/ndb/include/transporter \ + -I\$(top_srcdir)/ndb/include/debugger \ + -I\$(top_srcdir)/ndb/include/mgmcommon \ + -I\$(top_srcdir)/ndb/include/ndbapi \ + -I\$(top_srcdir)/ndb/include/util \ + -I\$(top_srcdir)/ndb/include/portlib \ + -I\$(top_srcdir)/ndb/include/logger" + NDB_NDBAPITEST_INCLUDES="\ + -I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \ + -I\$(top_srcdir)/ndb/include/ndbapi \ + -I\$(top_srcdir)/ndb/include/util \ + -I\$(top_srcdir)/ndb/include/portlib \ + -I\$(top_srcdir)/ndb/test/include \ + -I\$(top_srcdir)/ndb/include/mgmapi" + NDB_NDBAPICLIENT_INCLUDES="-I\$(top_srcdir)/ndb/include/ndbapi" + NDB_MGMAPICLIENT_INCLUDES="-I\$(top_srcdir)/ndb/include/mgmapi" + + AC_SUBST(NDB_DEFS) + AC_SUBST(NDB_UTIL_INCLUDES) + + AC_SUBST(NDB_UTIL_INCLUDES) + AC_SUBST(NDB_KERNEL_INCLUDES) + AC_SUBST(NDB_NDBAPI_INCLUDES) + AC_SUBST(NDB_NDBAPITEST_INCLUDES) + AC_SUBST(NDB_NDBAPICLIENT_INCLUDES) + AC_SUBST(NDB_MGMAPICLIENT_INCLUDES) + + #NDB_TYPE_COMMON="include \$(top_srcdir)/ndb/config/common.mk.am" + #NDB_TYPE_NDBAPI="include \$(top_srcdir)/ndb/config/type_ndbapi.mk.am" + #NDB_TYPE_NDBAPI="include \$(top_srcdir)/ndb/config/type_ndbapitest.mk.am" + #NDB_TYPE_KERNEL="include \$(top_srcdir)/ndb/config/type_kernel.mk.am" + #NDB_TYPE_UTIL="include \$(top_srcdir)/ndb/config/type_util.mk.am" + #AC_SUBST(NDB_TYPE_COMMON) + #AC_SUBST(NDB_TYPE_NDBAPI) + #AC_SUBST(NDB_TYPE_NDBAPITEST) + #AC_SUBST(NDB_TYPE_KERNEL) + #AC_SUBST(NDB_TYPE_UTIL) + + define(NDB_MAKEFILES, [ dnl + ndb/Makefile ndb/include/Makefile ndb/src/Makefile ndb/src/common/Makefile dnl + ndb/tools/Makefile dnl + ndb/src/common/debugger/Makefile ndb/src/common/debugger/signaldata/Makefile dnl + ndb/src/common/util/Makefile dnl + ndb/src/common/logger/Makefile dnl + ndb/src/common/transporter/Makefile dnl + ndb/src/common/mgmcommon/Makefile dnl + ndb/src/common/editline/Makefile dnl + ndb/src/kernel/Makefile dnl + ndb/src/kernel/error/Makefile dnl + ndb/src/kernel/blocks/Makefile dnl + ndb/src/kernel/blocks/cmvmi/Makefile dnl + ndb/src/kernel/blocks/dbacc/Makefile dnl + ndb/src/kernel/blocks/dbdict/Makefile dnl + ndb/src/kernel/blocks/dbdih/Makefile dnl + ndb/src/kernel/blocks/dblqh/Makefile dnl + ndb/src/kernel/blocks/dbtc/Makefile dnl + ndb/src/kernel/blocks/dbtup/Makefile dnl + ndb/src/kernel/blocks/ndbfs/Makefile dnl + ndb/src/kernel/blocks/ndbcntr/Makefile dnl + ndb/src/kernel/blocks/qmgr/Makefile dnl + ndb/src/kernel/blocks/trix/Makefile dnl + ndb/src/kernel/blocks/backup/Makefile dnl + ndb/src/kernel/blocks/backup/restore/Makefile dnl + ndb/src/kernel/blocks/dbutil/Makefile dnl + ndb/src/kernel/blocks/suma/Makefile dnl + ndb/src/kernel/blocks/grep/Makefile dnl + ndb/src/kernel/blocks/dbtux/Makefile dnl + ndb/src/kernel/vm/Makefile dnl + ndb/src/kernel/ndb-main/Makefile dnl + ndb/src/mgmapi/Makefile dnl + ndb/src/ndbapi/Makefile dnl + ndb/src/mgmsrv/Makefile dnl + ndb/src/mgmclient/Makefile dnl + ndb/src/cw/Makefile dnl + ndb/src/cw/cpcd/Makefile dnl + ndb/test/Makefile dnl + ndb/test/src/Makefile dnl + ndb/test/ndbapi/Makefile dnl + ndb/test/ndbapi/bank/Makefile dnl + ndb/test/tools/Makefile dnl + ndb/test/run-test/Makefile dnl + ]) + AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) # Output results AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl + NDB_MAKEFILES dnl strings/Makefile regex/Makefile heap/Makefile dnl bdb/Makefile dnl myisam/Makefile myisammrg/Makefile dnl diff --git a/ndb/Epilogue.mk b/ndb/Epilogue.mk_old similarity index 100% rename from ndb/Epilogue.mk rename to ndb/Epilogue.mk_old diff --git a/ndb/Makefile.am b/ndb/Makefile.am new file mode 100644 index 00000000000..a18f83fcf29 --- /dev/null +++ b/ndb/Makefile.am @@ -0,0 +1,6 @@ +## find * -name '*.hpp' -print | grep -v SCCS | grep -v odbc | sed 's/\.hpp/\.hpp \\/' > tmp.out +## find * -name '*.h' -print | grep -v SCCS | grep -v odbc | sed 's/\.h/\.h \\/' >> tmp.out + +SUBDIRS = . include src test tools + +noinst_HEADERS = diff --git a/ndb/Makefile b/ndb/Makefile_old similarity index 100% rename from ndb/Makefile rename to ndb/Makefile_old diff --git a/ndb/config/GuessConfig.sh b/ndb/config/GuessConfig.sh_old similarity index 100% rename from ndb/config/GuessConfig.sh rename to ndb/config/GuessConfig.sh_old diff --git a/ndb/config/Makefile.am b/ndb/config/Makefile.am_old similarity index 100% rename from ndb/config/Makefile.am rename to ndb/config/Makefile.am_old diff --git a/ndb/config/common.mk.am b/ndb/config/common.mk.am new file mode 100644 index 00000000000..f8d0882ac00 --- /dev/null +++ b/ndb/config/common.mk.am @@ -0,0 +1,17 @@ + +INCLUDES = $(INCLUDES_LOC) +LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC) +DEFS = @DEFS@ @NDB_DEFS@ +# ndb cannot be compiled with -fno-implicit-templaces +NDB_CXXFLAGS=-fimplicit-templates +##use AM_CXXFLAGS for other flags + +#noinst_SCRIPTS = ndb_local_bin +ndb_local_bin: $(PROGRAMS) + set -x; \ + for f in $(PROGRAMS); do \ + g=lib/`basename $$f`; \ + rm -f $$g; \ + @LN_CP_F@ $$f; \ + done; \ + touch $@; diff --git a/ndb/config/type_kernel.mk.am b/ndb/config/type_kernel.mk.am new file mode 100644 index 00000000000..c389a64b936 --- /dev/null +++ b/ndb/config/type_kernel.mk.am @@ -0,0 +1,2 @@ + +INCLUDES += @NDB_KERNEL_INCLUDES@ diff --git a/ndb/config/type_mgmapiclient.mk.am b/ndb/config/type_mgmapiclient.mk.am new file mode 100644 index 00000000000..f3bebb2c756 --- /dev/null +++ b/ndb/config/type_mgmapiclient.mk.am @@ -0,0 +1,2 @@ + +INCLUDES += @NDB_MGMAPICLIENT_INCLUDES@ diff --git a/ndb/config/type_ndbapi.mk.am b/ndb/config/type_ndbapi.mk.am new file mode 100644 index 00000000000..864690cec7b --- /dev/null +++ b/ndb/config/type_ndbapi.mk.am @@ -0,0 +1,2 @@ + +INCLUDES += @NDB_NDBAPI_INCLUDES@ diff --git a/ndb/config/type_ndbapiclient.mk.am b/ndb/config/type_ndbapiclient.mk.am new file mode 100644 index 00000000000..f9655ff9876 --- /dev/null +++ b/ndb/config/type_ndbapiclient.mk.am @@ -0,0 +1,2 @@ + +INCLUDES += @NDB_NDBAPICLIENT_INCLUDES@ diff --git a/ndb/config/type_ndbapitest.mk.am b/ndb/config/type_ndbapitest.mk.am new file mode 100644 index 00000000000..20ba5032d02 --- /dev/null +++ b/ndb/config/type_ndbapitest.mk.am @@ -0,0 +1,6 @@ + +LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \ + $(top_srcdir)/ndb/src/ndbapi/libNDB_API.la \ + $(top_srcdir)/ndb/src/mgmapi/libMGM_API.la + +INCLUDES += @NDB_NDBAPITEST_INCLUDES@ diff --git a/ndb/config/type_util.mk.am b/ndb/config/type_util.mk.am new file mode 100644 index 00000000000..8c9c7e0b504 --- /dev/null +++ b/ndb/config/type_util.mk.am @@ -0,0 +1,7 @@ + +LDADD += \ + $(top_srcdir)/ndb/src/common/logger/liblogger.la \ + $(top_srcdir)/ndb/src/common/util/libgeneral.la \ + $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la + +INCLUDES += @NDB_UTIL_INCLUDES@ diff --git a/ndb/configure b/ndb/configure_old similarity index 100% rename from ndb/configure rename to ndb/configure_old diff --git a/ndb/src/Makefile.am b/ndb/src/Makefile.am new file mode 100644 index 00000000000..745a33ccf45 --- /dev/null +++ b/ndb/src/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = common mgmapi ndbapi kernel mgmsrv mgmclient cw diff --git a/ndb/src/Makefile b/ndb/src/Makefile_old similarity index 100% rename from ndb/src/Makefile rename to ndb/src/Makefile_old diff --git a/ndb/src/common/Makefile.am b/ndb/src/common/Makefile.am new file mode 100644 index 00000000000..9ccf6f4350c --- /dev/null +++ b/ndb/src/common/Makefile.am @@ -0,0 +1,13 @@ +SUBDIRS = portlib debugger util logger transporter mgmcommon editline + +noinst_LTLIBRARIES = libcommon.la + +libcommon_la_SOURCES = +libcommon_la_LIBADD = \ + transporter/libtransporter.la \ + debugger/libtrace.la \ + debugger/signaldata/libsignaldataprint.la \ + mgmcommon/libmgmsrvcommon.la \ + portlib/unix/libportlib.la \ + logger/liblogger.la \ + util/libgeneral.la diff --git a/ndb/src/common/Makefile b/ndb/src/common/Makefile_old similarity index 100% rename from ndb/src/common/Makefile rename to ndb/src/common/Makefile_old diff --git a/ndb/src/common/debugger/Makefile.am b/ndb/src/common/debugger/Makefile.am new file mode 100644 index 00000000000..0278d0d2ba0 --- /dev/null +++ b/ndb/src/common/debugger/Makefile.am @@ -0,0 +1,11 @@ +SUBDIRS = signaldata + +noinst_LTLIBRARIES = libtrace.la + +libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp LogLevel.cpp EventLogger.cpp GrepError.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/common/debugger/Makefile b/ndb/src/common/debugger/Makefile_old similarity index 100% rename from ndb/src/common/debugger/Makefile rename to ndb/src/common/debugger/Makefile_old diff --git a/ndb/src/common/debugger/signaldata/Makefile.am b/ndb/src/common/debugger/signaldata/Makefile.am new file mode 100644 index 00000000000..ee66f39d4fd --- /dev/null +++ b/ndb/src/common/debugger/signaldata/Makefile.am @@ -0,0 +1,32 @@ + +noinst_LTLIBRARIES = libsignaldataprint.la + +libsignaldataprint_la_SOURCES = \ + TcKeyReq.cpp TcKeyConf.cpp TcKeyRef.cpp \ + TcRollbackRep.cpp \ + TupKey.cpp TupCommit.cpp LqhKey.cpp \ + FsOpenReq.cpp FsCloseReq.cpp FsRef.cpp FsConf.cpp FsReadWriteReq.cpp\ + SignalDataPrint.cpp SignalNames.cpp \ + ContinueB.cpp DihContinueB.cpp NdbfsContinueB.cpp \ + CloseComReqConf.cpp PackedSignal.cpp PrepFailReqRef.cpp \ + GCPSave.cpp DictTabInfo.cpp \ + AlterTable.cpp AlterTab.cpp \ + CreateTrig.cpp AlterTrig.cpp DropTrig.cpp \ + FireTrigOrd.cpp TrigAttrInfo.cpp \ + CreateIndx.cpp AlterIndx.cpp DropIndx.cpp TcIndx.cpp \ + IndxKeyInfo.cpp IndxAttrInfo.cpp \ + FsAppendReq.cpp ScanTab.cpp \ + BackupImpl.cpp BackupSignalData.cpp \ + UtilSequence.cpp UtilPrepare.cpp UtilDelete.cpp UtilExecute.cpp \ + LqhFrag.cpp DropTab.cpp PrepDropTab.cpp LCP.cpp MasterLCP.cpp \ + CopyGCI.cpp SystemError.cpp StartRec.cpp NFCompleteRep.cpp \ + FailRep.cpp DisconnectRep.cpp SignalDroppedRep.cpp \ + SumaImpl.cpp NdbSttor.cpp CreateFragmentation.cpp \ + UtilLock.cpp TuxMaint.cpp TupAccess.cpp AccLock.cpp \ + LqhTrans.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapi.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/common/debugger/signaldata/Makefile b/ndb/src/common/debugger/signaldata/Makefile_old similarity index 100% rename from ndb/src/common/debugger/signaldata/Makefile rename to ndb/src/common/debugger/signaldata/Makefile_old diff --git a/ndb/src/common/editline/Makefile.am b/ndb/src/common/editline/Makefile.am new file mode 100644 index 00000000000..4f53bdc6326 --- /dev/null +++ b/ndb/src/common/editline/Makefile.am @@ -0,0 +1,10 @@ + +noinst_LIBRARIES = libeditline.a + +libeditline_a_SOURCES = complete.c editline.c sysunix.c + +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/ndb/include +DEFS = -DANSI_ARROWS -DHAVE_TCGETATTR -DSYS_UNIX + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/common/editline/Makefile b/ndb/src/common/editline/Makefile_old similarity index 100% rename from ndb/src/common/editline/Makefile rename to ndb/src/common/editline/Makefile_old diff --git a/ndb/src/common/logger/Makefile.am b/ndb/src/common/logger/Makefile.am new file mode 100644 index 00000000000..0a48214c37c --- /dev/null +++ b/ndb/src/common/logger/Makefile.am @@ -0,0 +1,11 @@ + +noinst_LTLIBRARIES = liblogger.la + +liblogger_la_SOURCES = Logger.cpp LogHandlerList.cpp LogHandler.cpp \ + ConsoleLogHandler.cpp FileLogHandler.cpp SysLogHandler.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapi.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/common/logger/Makefile b/ndb/src/common/logger/Makefile_old similarity index 100% rename from ndb/src/common/logger/Makefile rename to ndb/src/common/logger/Makefile_old diff --git a/ndb/src/common/mgmcommon/Makefile.am b/ndb/src/common/mgmcommon/Makefile.am new file mode 100644 index 00000000000..25c5d11c1c1 --- /dev/null +++ b/ndb/src/common/mgmcommon/Makefile.am @@ -0,0 +1,16 @@ +noinst_LTLIBRARIES = libmgmsrvcommon.la + +libmgmsrvcommon_la_SOURCES = \ + LocalConfig.cpp \ + Config.cpp \ + ConfigInfo.cpp \ + ConfigRetriever.cpp \ + InitConfigFileParser.cpp \ + IPCConfig.cpp NdbConfig.c + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapi.mk.am +include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/common/mgmcommon/Makefile b/ndb/src/common/mgmcommon/Makefile_old similarity index 100% rename from ndb/src/common/mgmcommon/Makefile rename to ndb/src/common/mgmcommon/Makefile_old diff --git a/ndb/src/common/portlib/Makefile.am b/ndb/src/common/portlib/Makefile.am new file mode 100644 index 00000000000..2b1c9eb5ac0 --- /dev/null +++ b/ndb/src/common/portlib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = unix diff --git a/ndb/src/common/portlib/Makefile b/ndb/src/common/portlib/Makefile_old similarity index 100% rename from ndb/src/common/portlib/Makefile rename to ndb/src/common/portlib/Makefile_old diff --git a/ndb/src/common/portlib/unix/Makefile.am b/ndb/src/common/portlib/unix/Makefile.am new file mode 100644 index 00000000000..f50d46c1873 --- /dev/null +++ b/ndb/src/common/portlib/unix/Makefile.am @@ -0,0 +1,13 @@ + +noinst_LTLIBRARIES = libportlib.la + +libportlib_la_SOURCES = \ + NdbCondition.c NdbMutex.c NdbSleep.c NdbTick.c \ + NdbEnv.c NdbThread.c NdbHost.c NdbTCP.c \ + NdbDaemon.c NdbMem.c + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_util.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/common/portlib/unix/Makefile b/ndb/src/common/portlib/unix/Makefile_old similarity index 100% rename from ndb/src/common/portlib/unix/Makefile rename to ndb/src/common/portlib/unix/Makefile_old diff --git a/ndb/src/common/transporter/Makefile.am b/ndb/src/common/transporter/Makefile.am new file mode 100644 index 00000000000..8c46cc29051 --- /dev/null +++ b/ndb/src/common/transporter/Makefile.am @@ -0,0 +1,17 @@ + +noinst_LTLIBRARIES = libtransporter.la + +libtransporter_la_SOURCES = \ + Transporter.cpp \ + SendBuffer.cpp \ + TCP_Transporter.cpp \ + TransporterRegistry.cpp \ + Packer.cpp \ + SHM_Transporter.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_util.mk.am +INCLUDES += -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/common/transporter/Makefile b/ndb/src/common/transporter/Makefile_old similarity index 100% rename from ndb/src/common/transporter/Makefile rename to ndb/src/common/transporter/Makefile_old diff --git a/ndb/src/common/util/Makefile.am b/ndb/src/common/util/Makefile.am new file mode 100644 index 00000000000..a6b3d30ecb2 --- /dev/null +++ b/ndb/src/common/util/Makefile.am @@ -0,0 +1,16 @@ + +noinst_LTLIBRARIES = libgeneral.la + +libgeneral_la_SOURCES = \ + File.cpp md5_hash.cpp Properties.cpp socket_io.cpp \ + SimpleProperties.cpp Parser.cpp InputStream.cpp SocketServer.cpp \ + OutputStream.cpp NdbOut.cpp BaseString.cpp Base64.cpp \ + NdbSqlUtil.cpp new.cpp \ + uucode.c random.c getarg.c version.c \ + strdup.c strlcat.c strlcpy.c + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_util.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/common/util/Makefile b/ndb/src/common/util/Makefile_old similarity index 100% rename from ndb/src/common/util/Makefile rename to ndb/src/common/util/Makefile_old diff --git a/ndb/src/cw/Makefile.am b/ndb/src/cw/Makefile.am new file mode 100644 index 00000000000..b530922a3a7 --- /dev/null +++ b/ndb/src/cw/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = cpcd diff --git a/ndb/src/cw/Makefile b/ndb/src/cw/Makefile_old similarity index 100% rename from ndb/src/cw/Makefile rename to ndb/src/cw/Makefile_old diff --git a/ndb/src/cw/cpcd/Makefile.am b/ndb/src/cw/cpcd/Makefile.am new file mode 100644 index 00000000000..029ce213987 --- /dev/null +++ b/ndb/src/cw/cpcd/Makefile.am @@ -0,0 +1,12 @@ + +bin_PROGRAMS = ndb_cpcd + +ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp + +LDADD_LOC = $(top_srcdir)/ndb/src/common/logger/liblogger.la + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_util.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/cw/cpcd/Makefile b/ndb/src/cw/cpcd/Makefile_old similarity index 100% rename from ndb/src/cw/cpcd/Makefile rename to ndb/src/cw/cpcd/Makefile_old diff --git a/ndb/src/kernel/Makefile.am b/ndb/src/kernel/Makefile.am new file mode 100644 index 00000000000..1e52a561964 --- /dev/null +++ b/ndb/src/kernel/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = error blocks vm ndb-main diff --git a/ndb/src/kernel/Makefile b/ndb/src/kernel/Makefile_old similarity index 100% rename from ndb/src/kernel/Makefile rename to ndb/src/kernel/Makefile_old diff --git a/ndb/src/kernel/blocks/Makefile.am b/ndb/src/kernel/blocks/Makefile.am new file mode 100644 index 00000000000..0b2bc3b8c88 --- /dev/null +++ b/ndb/src/kernel/blocks/Makefile.am @@ -0,0 +1,17 @@ +SUBDIRS = \ + cmvmi \ + dbacc \ + dbdict \ + dbdih \ + dblqh \ + dbtc \ + dbtup \ + ndbfs \ + ndbcntr \ + qmgr \ + trix \ + backup \ + dbutil \ + suma \ + grep \ + dbtux diff --git a/ndb/src/kernel/blocks/Makefile b/ndb/src/kernel/blocks/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/Makefile rename to ndb/src/kernel/blocks/Makefile_old diff --git a/ndb/src/kernel/blocks/backup/Makefile.am b/ndb/src/kernel/blocks/backup/Makefile.am new file mode 100644 index 00000000000..85bf5b12415 --- /dev/null +++ b/ndb/src/kernel/blocks/backup/Makefile.am @@ -0,0 +1,12 @@ + +SUBDIRS = restore + +noinst_LIBRARIES = libbackup.a + +libbackup_a_SOURCES = Backup.cpp BackupInit.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/backup/Makefile b/ndb/src/kernel/blocks/backup/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/backup/Makefile rename to ndb/src/kernel/blocks/backup/Makefile_old diff --git a/ndb/src/kernel/blocks/backup/restore/Makefile.am b/ndb/src/kernel/blocks/backup/restore/Makefile.am new file mode 100644 index 00000000000..d2c8e5a5e4f --- /dev/null +++ b/ndb/src/kernel/blocks/backup/restore/Makefile.am @@ -0,0 +1,10 @@ + +bin_PROGRAMS = restore + +restore_SOURCES = main.cpp Restore.cpp + +LDADD_LOC = $(top_srcdir)/ndb/src/ndbapi/libNDB_API.la + +include $(top_srcdir)/ndb/config/common.mk.am + +INCLUDES += -I.. -I$(top_srcdir)/include -I$(top_srcdir)/ndb/include -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/include/ndbapi -I$(top_srcdir)/ndb/include/util -I$(top_srcdir)/ndb/include/portlib -I$(top_srcdir)/ndb/include/kernel diff --git a/ndb/src/kernel/blocks/backup/restore/Makefile b/ndb/src/kernel/blocks/backup/restore/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/backup/restore/Makefile rename to ndb/src/kernel/blocks/backup/restore/Makefile_old diff --git a/ndb/src/kernel/blocks/cmvmi/Makefile.am b/ndb/src/kernel/blocks/cmvmi/Makefile.am new file mode 100644 index 00000000000..fdd43932682 --- /dev/null +++ b/ndb/src/kernel/blocks/cmvmi/Makefile.am @@ -0,0 +1,10 @@ + +noinst_LIBRARIES = libcmvmi.a + +libcmvmi_a_SOURCES = Cmvmi.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/cmvmi/Makefile b/ndb/src/kernel/blocks/cmvmi/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/cmvmi/Makefile rename to ndb/src/kernel/blocks/cmvmi/Makefile_old diff --git a/ndb/src/kernel/blocks/dbacc/Makefile.am b/ndb/src/kernel/blocks/dbacc/Makefile.am new file mode 100644 index 00000000000..7ccfbe22f76 --- /dev/null +++ b/ndb/src/kernel/blocks/dbacc/Makefile.am @@ -0,0 +1,10 @@ + +noinst_LIBRARIES = libdbacc.a + +libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/dbacc/Makefile b/ndb/src/kernel/blocks/dbacc/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/dbacc/Makefile rename to ndb/src/kernel/blocks/dbacc/Makefile_old diff --git a/ndb/src/kernel/blocks/dbdict/Makefile.am b/ndb/src/kernel/blocks/dbdict/Makefile.am new file mode 100644 index 00000000000..dc4c4fe4734 --- /dev/null +++ b/ndb/src/kernel/blocks/dbdict/Makefile.am @@ -0,0 +1,11 @@ +#SUBDIRS = printSchemafile + +noinst_LIBRARIES = libdbdict.a + +libdbdict_a_SOURCES = Dbdict.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/dbdict/Makefile b/ndb/src/kernel/blocks/dbdict/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/dbdict/Makefile rename to ndb/src/kernel/blocks/dbdict/Makefile_old diff --git a/ndb/src/kernel/blocks/dbdih/Makefile.am b/ndb/src/kernel/blocks/dbdih/Makefile.am new file mode 100644 index 00000000000..2ee8017ec13 --- /dev/null +++ b/ndb/src/kernel/blocks/dbdih/Makefile.am @@ -0,0 +1,9 @@ +noinst_LIBRARIES = libdbdih.a + +libdbdih_a_SOURCES = DbdihInit.cpp DbdihMain.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/dbdih/Makefile b/ndb/src/kernel/blocks/dbdih/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/dbdih/Makefile rename to ndb/src/kernel/blocks/dbdih/Makefile_old diff --git a/ndb/src/kernel/blocks/dblqh/Makefile.am b/ndb/src/kernel/blocks/dblqh/Makefile.am new file mode 100644 index 00000000000..3a58dba742e --- /dev/null +++ b/ndb/src/kernel/blocks/dblqh/Makefile.am @@ -0,0 +1,11 @@ +#SUBDIRS = redoLogReader + +noinst_LIBRARIES = libdblqh.a + +libdblqh_a_SOURCES = DblqhInit.cpp DblqhMain.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/dblqh/Makefile b/ndb/src/kernel/blocks/dblqh/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/dblqh/Makefile rename to ndb/src/kernel/blocks/dblqh/Makefile_old diff --git a/ndb/src/kernel/blocks/dbtc/Makefile.am b/ndb/src/kernel/blocks/dbtc/Makefile.am new file mode 100644 index 00000000000..4aa514c0aba --- /dev/null +++ b/ndb/src/kernel/blocks/dbtc/Makefile.am @@ -0,0 +1,9 @@ +noinst_LIBRARIES = libdbtc.a + +libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/dbtc/Makefile b/ndb/src/kernel/blocks/dbtc/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/dbtc/Makefile rename to ndb/src/kernel/blocks/dbtc/Makefile_old diff --git a/ndb/src/kernel/blocks/dbtup/Makefile.am b/ndb/src/kernel/blocks/dbtup/Makefile.am new file mode 100644 index 00000000000..7e94a01d43b --- /dev/null +++ b/ndb/src/kernel/blocks/dbtup/Makefile.am @@ -0,0 +1,27 @@ +noinst_LIBRARIES = libdbtup.a + +libdbtup_a_SOURCES = \ + DbtupExecQuery.cpp \ + DbtupBuffer.cpp \ + DbtupRoutines.cpp \ + DbtupCommit.cpp \ + DbtupFixAlloc.cpp \ + DbtupTrigger.cpp \ + DbtupAbort.cpp \ + DbtupLCP.cpp \ + DbtupUndoLog.cpp \ + DbtupPageMap.cpp \ + DbtupPagMan.cpp \ + DbtupStoredProcDef.cpp \ + DbtupMeta.cpp \ + DbtupTabDesMan.cpp \ + DbtupGen.cpp \ + DbtupSystemRestart.cpp \ + DbtupIndex.cpp \ + DbtupDebug.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/dbtup/Makefile b/ndb/src/kernel/blocks/dbtup/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/dbtup/Makefile rename to ndb/src/kernel/blocks/dbtup/Makefile_old diff --git a/ndb/src/kernel/blocks/dbtux/Makefile.am b/ndb/src/kernel/blocks/dbtux/Makefile.am new file mode 100644 index 00000000000..5ba59e8b3b7 --- /dev/null +++ b/ndb/src/kernel/blocks/dbtux/Makefile.am @@ -0,0 +1,17 @@ +noinst_LIBRARIES = libdbtux.a + +libdbtux_a_SOURCES = \ + DbtuxGen.cpp \ + DbtuxMeta.cpp \ + DbtuxMaint.cpp \ + DbtuxNode.cpp \ + DbtuxTree.cpp \ + DbtuxScan.cpp \ + DbtuxCmp.cpp \ + DbtuxDebug.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/dbtux/Makefile b/ndb/src/kernel/blocks/dbtux/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/dbtux/Makefile rename to ndb/src/kernel/blocks/dbtux/Makefile_old diff --git a/ndb/src/kernel/blocks/dbutil/Makefile.am b/ndb/src/kernel/blocks/dbutil/Makefile.am new file mode 100644 index 00000000000..763875d578f --- /dev/null +++ b/ndb/src/kernel/blocks/dbutil/Makefile.am @@ -0,0 +1,9 @@ +noinst_LIBRARIES = libdbutil.a + +libdbutil_a_SOURCES = DbUtil.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/dbutil/Makefile b/ndb/src/kernel/blocks/dbutil/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/dbutil/Makefile rename to ndb/src/kernel/blocks/dbutil/Makefile_old diff --git a/ndb/src/kernel/blocks/grep/Makefile.am b/ndb/src/kernel/blocks/grep/Makefile.am new file mode 100644 index 00000000000..31081c7b6a0 --- /dev/null +++ b/ndb/src/kernel/blocks/grep/Makefile.am @@ -0,0 +1,9 @@ +noinst_LIBRARIES = libgrep.a + +libgrep_a_SOURCES = Grep.cpp GrepInit.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/grep/Makefile b/ndb/src/kernel/blocks/grep/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/grep/Makefile rename to ndb/src/kernel/blocks/grep/Makefile_old diff --git a/ndb/src/kernel/blocks/ndbcntr/Makefile.am b/ndb/src/kernel/blocks/ndbcntr/Makefile.am new file mode 100644 index 00000000000..9230b55b374 --- /dev/null +++ b/ndb/src/kernel/blocks/ndbcntr/Makefile.am @@ -0,0 +1,12 @@ +noinst_LIBRARIES = libndbcntr.a + +libndbcntr_a_SOURCES = \ + NdbcntrInit.cpp \ + NdbcntrSysTable.cpp \ + NdbcntrMain.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/ndbcntr/Makefile b/ndb/src/kernel/blocks/ndbcntr/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/ndbcntr/Makefile rename to ndb/src/kernel/blocks/ndbcntr/Makefile_old diff --git a/ndb/src/kernel/blocks/ndbfs/Makefile.am b/ndb/src/kernel/blocks/ndbfs/Makefile.am new file mode 100644 index 00000000000..c2b663c5042 --- /dev/null +++ b/ndb/src/kernel/blocks/ndbfs/Makefile.am @@ -0,0 +1,13 @@ +noinst_LIBRARIES = libndbfs.a + +libndbfs_a_SOURCES = \ + AsyncFile.cpp \ + Ndbfs.cpp VoidFs.cpp \ + Filename.cpp \ + CircularIndex.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/ndbfs/Makefile b/ndb/src/kernel/blocks/ndbfs/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/Makefile rename to ndb/src/kernel/blocks/ndbfs/Makefile_old diff --git a/ndb/src/kernel/blocks/qmgr/Makefile.am b/ndb/src/kernel/blocks/qmgr/Makefile.am new file mode 100644 index 00000000000..52cadb3bd3d --- /dev/null +++ b/ndb/src/kernel/blocks/qmgr/Makefile.am @@ -0,0 +1,11 @@ +noinst_LIBRARIES = libqmgr.a + +libqmgr_a_SOURCES = \ + QmgrInit.cpp \ + QmgrMain.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/qmgr/Makefile b/ndb/src/kernel/blocks/qmgr/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/qmgr/Makefile rename to ndb/src/kernel/blocks/qmgr/Makefile_old diff --git a/ndb/src/kernel/blocks/suma/Makefile.am b/ndb/src/kernel/blocks/suma/Makefile.am new file mode 100644 index 00000000000..5fc59083484 --- /dev/null +++ b/ndb/src/kernel/blocks/suma/Makefile.am @@ -0,0 +1,9 @@ +pkglib_LIBRARIES = libsuma.a + +libsuma_a_SOURCES = Suma.cpp SumaInit.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/suma/Makefile b/ndb/src/kernel/blocks/suma/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/suma/Makefile rename to ndb/src/kernel/blocks/suma/Makefile_old diff --git a/ndb/src/kernel/blocks/trix/Makefile.am b/ndb/src/kernel/blocks/trix/Makefile.am new file mode 100644 index 00000000000..803da815cf0 --- /dev/null +++ b/ndb/src/kernel/blocks/trix/Makefile.am @@ -0,0 +1,9 @@ +noinst_LIBRARIES = libtrix.a + +libtrix_a_SOURCES = Trix.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/blocks/trix/Makefile b/ndb/src/kernel/blocks/trix/Makefile_old similarity index 100% rename from ndb/src/kernel/blocks/trix/Makefile rename to ndb/src/kernel/blocks/trix/Makefile_old diff --git a/ndb/src/kernel/error/Makefile.am b/ndb/src/kernel/error/Makefile.am new file mode 100644 index 00000000000..5ddf050caaa --- /dev/null +++ b/ndb/src/kernel/error/Makefile.am @@ -0,0 +1,11 @@ +pkglib_LIBRARIES = liberror.a + +liberror_a_SOURCES = TimeModule.cpp \ + ErrorReporter.cpp \ + ErrorMessages.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/error/Makefile b/ndb/src/kernel/error/Makefile_old similarity index 100% rename from ndb/src/kernel/error/Makefile rename to ndb/src/kernel/error/Makefile_old diff --git a/ndb/src/kernel/ndb-main/Makefile.am b/ndb/src/kernel/ndb-main/Makefile.am new file mode 100644 index 00000000000..f6995ed49a0 --- /dev/null +++ b/ndb/src/kernel/ndb-main/Makefile.am @@ -0,0 +1,55 @@ + +bin_PROGRAMS = ndb + +ndb_SOURCES = Main.cpp SimBlockList.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am +INCLUDES += \ + -I../blocks/cmvmi \ + -I../blocks/dbacc \ + -I../blocks/dbdict \ + -I../blocks/dbdih \ + -I../blocks/dblqh \ + -I../blocks/dbtc \ + -I../blocks/dbtup \ + -I../blocks/ndbfs \ + -I../blocks/ndbcntr \ + -I../blocks/qmgr \ + -I../blocks/trix \ + -I../blocks/backup \ + -I../blocks/dbutil \ + -I../blocks/suma \ + -I../blocks/grep \ + -I../blocks/dbtux + +LDADD += \ + $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \ + ../blocks/cmvmi/libcmvmi.a \ + ../blocks/dbacc/libdbacc.a \ + ../blocks/dbdict/libdbdict.a \ + ../blocks/dbdih/libdbdih.a \ + ../blocks/dblqh/libdblqh.a \ + ../blocks/dbtc/libdbtc.a \ + ../blocks/dbtup/libdbtup.a \ + ../blocks/ndbfs/libndbfs.a \ + ../blocks/ndbcntr/libndbcntr.a \ + ../blocks/qmgr/libqmgr.a \ + ../blocks/trix/libtrix.a \ + ../blocks/backup/libbackup.a \ + ../blocks/dbutil/libdbutil.a \ + ../blocks/suma/libsuma.a \ + ../blocks/grep/libgrep.a \ + ../blocks/dbtux/libdbtux.a \ + ../vm/libkernel.a \ + ../error/liberror.a \ + $(top_srcdir)/ndb/src/common/transporter/libtransporter.la \ + $(top_srcdir)/ndb/src/common/debugger/libtrace.la \ + $(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \ + $(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \ + $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \ + $(top_srcdir)/ndb/src/common/logger/liblogger.la \ + $(top_srcdir)/ndb/src/common/util/libgeneral.la + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/ndb-main/Makefile b/ndb/src/kernel/ndb-main/Makefile_old similarity index 100% rename from ndb/src/kernel/ndb-main/Makefile rename to ndb/src/kernel/ndb-main/Makefile_old diff --git a/ndb/src/kernel/vm/Makefile.am b/ndb/src/kernel/vm/Makefile.am new file mode 100644 index 00000000000..8381fee96df --- /dev/null +++ b/ndb/src/kernel/vm/Makefile.am @@ -0,0 +1,28 @@ +#SUBDIRS = testCopy testDataBuffer testSimplePropertiesSection +#ifneq ($(USE_EDITLINE), N) +#DIRS += testLongSig +#endif + +pkglib_LIBRARIES = libkernel.a + +libkernel_a_SOURCES = \ + SimulatedBlock.cpp \ + FastScheduler.cpp \ + TimeQueue.cpp \ + VMSignal.cpp \ + ThreadConfig.cpp \ + TransporterCallback.cpp \ + Emulator.cpp \ + Configuration.cpp \ + ClusterConfiguration.cpp \ + WatchDog.cpp \ + SimplePropertiesSection.cpp \ + SectionReader.cpp \ + MetaData.cpp \ + Mutex.cpp SafeCounter.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_kernel.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/kernel/vm/Makefile b/ndb/src/kernel/vm/Makefile_old similarity index 100% rename from ndb/src/kernel/vm/Makefile rename to ndb/src/kernel/vm/Makefile_old diff --git a/ndb/src/mgmapi/Makefile.am b/ndb/src/mgmapi/Makefile.am new file mode 100644 index 00000000000..b223478ea56 --- /dev/null +++ b/ndb/src/mgmapi/Makefile.am @@ -0,0 +1,20 @@ + +noinst_LTLIBRARIES = libmgmapi.la libMGM_API.la + +libmgmapi_la_SOURCES_loc = mgmapi.cpp + +libmgmapi_la_SOURCES = $(libmgmapi_la_SOURCES_loc) +libMGM_API_la_SOURCES = $(libmgmapi_la_SOURCES_loc) + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_util.mk.am +INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon + +DEFS += -DNO_DEBUG_MESSAGES + +libMGM_API_la_LIBADD = \ + $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \ + $(top_srcdir)/ndb/src/common/util/libgeneral.la + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/mgmapi/Makefile b/ndb/src/mgmapi/Makefile_old similarity index 100% rename from ndb/src/mgmapi/Makefile rename to ndb/src/mgmapi/Makefile_old diff --git a/ndb/src/mgmclient/Makefile.am b/ndb/src/mgmclient/Makefile.am new file mode 100644 index 00000000000..c57e87d4d50 --- /dev/null +++ b/ndb/src/mgmclient/Makefile.am @@ -0,0 +1,23 @@ + +bin_PROGRAMS = mgmtclient + +mgmtclient_SOURCES = \ + main.cpp \ + CommandInterpreter.cpp \ + CpcClient.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapi.mk.am +INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon + +LDADD += \ + $(top_srcdir)/ndb/src/common/debugger/libtrace.la \ + $(top_srcdir)/ndb/src/common/logger/liblogger.la \ + $(top_srcdir)/ndb/src/common/util/libgeneral.la \ + $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \ + $(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \ + $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \ + $(top_srcdir)/ndb/src/common/editline/libeditline.a + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/mgmclient/Makefile b/ndb/src/mgmclient/Makefile_old similarity index 100% rename from ndb/src/mgmclient/Makefile rename to ndb/src/mgmclient/Makefile_old diff --git a/ndb/src/mgmsrv/Makefile.am b/ndb/src/mgmsrv/Makefile.am new file mode 100644 index 00000000000..b598ad6f49c --- /dev/null +++ b/ndb/src/mgmsrv/Makefile.am @@ -0,0 +1,29 @@ + +bin_PROGRAMS = mgmtsrvr + +mgmtsrvr_SOURCES = \ + MgmtSrvr.cpp \ + MgmtSrvrGeneralSignalHandling.cpp \ + main.cpp \ + Services.cpp \ + convertStrToInt.cpp \ + NodeLogLevel.cpp \ + NodeLogLevelList.cpp \ + SignalQueue.cpp \ + MgmtSrvrConfig.cpp \ + CommandInterpreter.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapi.mk.am +INCLUDES += -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon + +LDADD += \ + $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \ + $(top_srcdir)/ndb/src/ndbapi/libNDB_API.la \ + $(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \ + $(top_srcdir)/ndb/src/common/util/libgeneral.la \ + $(top_srcdir)/ndb/src/common/editline/libeditline.a \ + @TERMCAP_LIB@ + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/mgmsrv/Makefile b/ndb/src/mgmsrv/Makefile_old similarity index 100% rename from ndb/src/mgmsrv/Makefile rename to ndb/src/mgmsrv/Makefile_old diff --git a/ndb/src/ndbapi/Makefile.am b/ndb/src/ndbapi/Makefile.am new file mode 100644 index 00000000000..3f585be74c6 --- /dev/null +++ b/ndb/src/ndbapi/Makefile.am @@ -0,0 +1,55 @@ +#SUBDIRS = signal-sender + +noinst_LTLIBRARIES = libndbapi.la libNDB_API.la + +libndbapi_la_SOURCES_loc = \ + TransporterFacade.cpp \ + ClusterMgr.cpp \ + Ndb.cpp \ + NdbPoolImpl.cpp NdbPool.cpp \ + Ndblist.cpp \ + Ndbif.cpp \ + Ndbinit.cpp \ + Ndberr.cpp \ + ndberror.c \ + NdbErrorOut.cpp \ + NdbConnection.cpp \ + NdbConnectionScan.cpp \ + NdbOperation.cpp \ + NdbOperationSearch.cpp \ + NdbOperationScan.cpp \ + NdbOperationInt.cpp \ + NdbOperationDefine.cpp \ + NdbOperationExec.cpp \ + NdbScanReceiver.cpp \ + NdbResultSet.cpp \ + NdbCursorOperation.cpp \ + NdbScanOperation.cpp NdbScanFilter.cpp \ + NdbIndexOperation.cpp \ + NdbEventOperation.cpp \ + NdbEventOperationImpl.cpp \ + NdbApiSignal.cpp \ + NdbRecAttr.cpp \ + NdbSchemaCon.cpp \ + NdbSchemaOp.cpp \ + NdbUtil.cpp \ + NdbReceiver.cpp \ + NdbDictionary.cpp NdbDictionaryImpl.cpp DictCache.cpp + +libndbapi_la_SOURCES = $(libndbapi_la_SOURCES_loc) +libNDB_API_la_SOURCES = $(libndbapi_la_SOURCES_loc) + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapi.mk.am + +libNDB_API_la_LIBADD = \ + $(top_srcdir)/ndb/src/common/transporter/libtransporter.la \ + $(top_srcdir)/ndb/src/common/debugger/libtrace.la \ + $(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \ + $(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \ + $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \ + $(top_srcdir)/ndb/src/common/logger/liblogger.la \ + $(top_srcdir)/ndb/src/common/util/libgeneral.la + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/src/ndbapi/Makefile b/ndb/src/ndbapi/Makefile_old similarity index 100% rename from ndb/src/ndbapi/Makefile rename to ndb/src/ndbapi/Makefile_old diff --git a/ndb/test/Makefile.am b/ndb/test/Makefile.am new file mode 100644 index 00000000000..cecbd0b8717 --- /dev/null +++ b/ndb/test/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = src tools ndbapi run-test diff --git a/ndb/test/Makefile b/ndb/test/Makefile_old similarity index 100% rename from ndb/test/Makefile rename to ndb/test/Makefile_old diff --git a/ndb/test/ndbapi/telco/InsertRecs.cpp b/ndb/test/ndbapi/InsertRecs.cpp similarity index 100% rename from ndb/test/ndbapi/telco/InsertRecs.cpp rename to ndb/test/ndbapi/InsertRecs.cpp diff --git a/ndb/test/ndbapi/Makefile.am b/ndb/test/ndbapi/Makefile.am new file mode 100644 index 00000000000..48870516c22 --- /dev/null +++ b/ndb/test/ndbapi/Makefile.am @@ -0,0 +1,79 @@ + +SUBDIRS = bank + +bin_PROGRAMS = \ +flexBench \ +drop_all_tabs \ +create_all_tabs \ +create_tab \ +flexAsynch \ +flexBench \ +flexHammer \ +flexScan \ +flexTT \ +flexTimedAsynch \ +testBackup \ +testBasic \ +testBasicAsynch \ +testDataBuffers \ +testDict \ +testIndex \ +testMgm \ +testNdbApi \ +testNodeRestart \ +testOIBasic \ +testOperations \ +testRestartGci \ +testScan \ +testScanInterpreter \ +testSystemRestart \ +testTimeout \ +testTransactions \ +test_event + +#testBlobs +#flex_bench_mysql + +create_all_tabs_SOURCES = create_all_tabs.cpp +create_tab_SOURCES = create_tab.cpp +drop_all_tabs_SOURCES = drop_all_tabs.cpp +flexAsynch_SOURCES = flexAsynch.cpp +flexBench_SOURCES = flexBench.cpp +flexHammer_SOURCES = flexHammer.cpp +flexScan_SOURCES = flexScan.cpp +flexTT_SOURCES = flexTT.cpp +flexTimedAsynch_SOURCES = flexTimedAsynch.cpp +#flex_bench_mysql_SOURCES = flex_bench_mysql.cpp +testBackup_SOURCES = testBackup.cpp +testBasic_SOURCES = testBasic.cpp +testBasicAsynch_SOURCES = testBasicAsynch.cpp +#testBlobs_SOURCES = testBlobs.cpp +testDataBuffers_SOURCES = testDataBuffers.cpp +testDict_SOURCES = testDict.cpp +testIndex_SOURCES = testIndex.cpp +testMgm_SOURCES = testMgm.cpp +testNdbApi_SOURCES = testNdbApi.cpp +testNodeRestart_SOURCES = testNodeRestart.cpp +testOIBasic_SOURCES = testOIBasic.cpp +testOperations_SOURCES = testOperations.cpp +testRestartGci_SOURCES = testRestartGci.cpp +testScan_SOURCES = testScan.cpp +testScanInterpreter_SOURCES = testScanInterpreter.cpp +testSystemRestart_SOURCES = testSystemRestart.cpp +testTimeout_SOURCES = testTimeout.cpp +testTransactions_SOURCES = testTransactions.cpp +test_event_SOURCES = test_event.cpp + +INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am + +##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel +##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel +##testSystemRestart_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel +##testTransactions_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel +testBackup_LDADD = $(LDADD) bank/libbank.a + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/test/ndbapi/Makefile b/ndb/test/ndbapi/Makefile_old similarity index 100% rename from ndb/test/ndbapi/Makefile rename to ndb/test/ndbapi/Makefile_old diff --git a/ndb/test/ndbapi/testScanInterpreter/ScanFilter.hpp b/ndb/test/ndbapi/ScanFilter.hpp similarity index 100% rename from ndb/test/ndbapi/testScanInterpreter/ScanFilter.hpp rename to ndb/test/ndbapi/ScanFilter.hpp diff --git a/ndb/test/ndbapi/testScan/ScanFunctions.hpp b/ndb/test/ndbapi/ScanFunctions.hpp similarity index 100% rename from ndb/test/ndbapi/testScan/ScanFunctions.hpp rename to ndb/test/ndbapi/ScanFunctions.hpp diff --git a/ndb/test/ndbapi/testScanInterpreter/ScanInterpretTest.hpp b/ndb/test/ndbapi/ScanInterpretTest.hpp similarity index 100% rename from ndb/test/ndbapi/testScanInterpreter/ScanInterpretTest.hpp rename to ndb/test/ndbapi/ScanInterpretTest.hpp diff --git a/ndb/test/ndbapi/acid2/TraceNdbApi.cpp b/ndb/test/ndbapi/TraceNdbApi.cpp similarity index 100% rename from ndb/test/ndbapi/acid2/TraceNdbApi.cpp rename to ndb/test/ndbapi/TraceNdbApi.cpp diff --git a/ndb/test/ndbapi/acid2/VerifyNdbApi.cpp b/ndb/test/ndbapi/VerifyNdbApi.cpp similarity index 100% rename from ndb/test/ndbapi/acid2/VerifyNdbApi.cpp rename to ndb/test/ndbapi/VerifyNdbApi.cpp diff --git a/ndb/test/ndbapi/acid/acid.cpp b/ndb/test/ndbapi/acid.cpp similarity index 100% rename from ndb/test/ndbapi/acid/acid.cpp rename to ndb/test/ndbapi/acid.cpp diff --git a/ndb/test/ndbapi/acid2/acid2.cpp b/ndb/test/ndbapi/acid2.cpp similarity index 100% rename from ndb/test/ndbapi/acid2/acid2.cpp rename to ndb/test/ndbapi/acid2.cpp diff --git a/ndb/test/ndbapi/telco/adoInsertRecs.cpp b/ndb/test/ndbapi/adoInsertRecs.cpp similarity index 100% rename from ndb/test/ndbapi/telco/adoInsertRecs.cpp rename to ndb/test/ndbapi/adoInsertRecs.cpp diff --git a/ndb/test/ndbapi/lmc-bench/async-src/generator/asyncGenerator.cpp b/ndb/test/ndbapi/asyncGenerator.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/generator/asyncGenerator.cpp rename to ndb/test/ndbapi/asyncGenerator.cpp diff --git a/ndb/test/ndbapi/bank/src/Bank.cpp b/ndb/test/ndbapi/bank/Bank.cpp similarity index 99% rename from ndb/test/ndbapi/bank/src/Bank.cpp rename to ndb/test/ndbapi/bank/Bank.cpp index 11ebf087fd4..14883205693 100644 --- a/ndb/test/ndbapi/bank/src/Bank.cpp +++ b/ndb/test/ndbapi/bank/Bank.cpp @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../Bank.hpp" +#include "Bank.hpp" #include #include #include diff --git a/ndb/test/ndbapi/bank/src/BankLoad.cpp b/ndb/test/ndbapi/bank/BankLoad.cpp similarity index 99% rename from ndb/test/ndbapi/bank/src/BankLoad.cpp rename to ndb/test/ndbapi/bank/BankLoad.cpp index 985a49d5f64..76261b664a6 100644 --- a/ndb/test/ndbapi/bank/src/BankLoad.cpp +++ b/ndb/test/ndbapi/bank/BankLoad.cpp @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../Bank.hpp" +#include "Bank.hpp" #include /** diff --git a/ndb/test/ndbapi/bank/Makefile.am b/ndb/test/ndbapi/bank/Makefile.am new file mode 100644 index 00000000000..03f8f1d1c0b --- /dev/null +++ b/ndb/test/ndbapi/bank/Makefile.am @@ -0,0 +1,22 @@ + +bin_PROGRAMS = testBank bankSumAccounts bankValidateAllGLs bankMakeGL bankTransactionMaker bankCreator bankTimer + +noinst_LIBRARIES = libbank.a + +libbank_a_SOURCES = Bank.cpp BankLoad.cpp + +testBank_SOURCES = testBank.cpp +bankSumAccounts_SOURCES = bankSumAccounts.cpp +bankValidateAllGLs_SOURCES = bankValidateAllGLs.cpp +bankMakeGL_SOURCES = bankMakeGL.cpp +bankTransactionMaker_SOURCES = bankTransactionMaker.cpp +bankCreator_SOURCES = bankCreator.cpp +bankTimer_SOURCES = bankTimer.cpp + +LDADD_LOC = $(noinst_LIBRARIES) + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/test/ndbapi/bank/Makefile b/ndb/test/ndbapi/bank/Makefile_old similarity index 100% rename from ndb/test/ndbapi/bank/Makefile rename to ndb/test/ndbapi/bank/Makefile_old diff --git a/ndb/test/ndbapi/bank/bankCreator/bankCreator.cpp b/ndb/test/ndbapi/bank/bankCreator.cpp similarity index 98% rename from ndb/test/ndbapi/bank/bankCreator/bankCreator.cpp rename to ndb/test/ndbapi/bank/bankCreator.cpp index d84818baf24..5331ec6ba69 100644 --- a/ndb/test/ndbapi/bank/bankCreator/bankCreator.cpp +++ b/ndb/test/ndbapi/bank/bankCreator.cpp @@ -23,7 +23,7 @@ #include #include #include -#include "../Bank.hpp" +#include "Bank.hpp" int main(int argc, const char** argv){ diff --git a/ndb/test/ndbapi/bank/bankMakeGL/bankMakeGL.cpp b/ndb/test/ndbapi/bank/bankMakeGL.cpp similarity index 98% rename from ndb/test/ndbapi/bank/bankMakeGL/bankMakeGL.cpp rename to ndb/test/ndbapi/bank/bankMakeGL.cpp index 55e9081a598..54bc559fbf9 100644 --- a/ndb/test/ndbapi/bank/bankMakeGL/bankMakeGL.cpp +++ b/ndb/test/ndbapi/bank/bankMakeGL.cpp @@ -23,7 +23,7 @@ #include #include #include -#include "../Bank.hpp" +#include "Bank.hpp" int main(int argc, const char** argv){ diff --git a/ndb/test/ndbapi/bank/bankSumAccounts/bankSumAccounts.cpp b/ndb/test/ndbapi/bank/bankSumAccounts.cpp similarity index 98% rename from ndb/test/ndbapi/bank/bankSumAccounts/bankSumAccounts.cpp rename to ndb/test/ndbapi/bank/bankSumAccounts.cpp index ab3e862e8d2..c0a903f9034 100644 --- a/ndb/test/ndbapi/bank/bankSumAccounts/bankSumAccounts.cpp +++ b/ndb/test/ndbapi/bank/bankSumAccounts.cpp @@ -23,7 +23,7 @@ #include #include #include -#include "../Bank.hpp" +#include "Bank.hpp" int main(int argc, const char** argv){ diff --git a/ndb/test/ndbapi/bank/bankTimer/bankTimer.cpp b/ndb/test/ndbapi/bank/bankTimer.cpp similarity index 98% rename from ndb/test/ndbapi/bank/bankTimer/bankTimer.cpp rename to ndb/test/ndbapi/bank/bankTimer.cpp index ba8de9e4af1..ba3165fccb4 100644 --- a/ndb/test/ndbapi/bank/bankTimer/bankTimer.cpp +++ b/ndb/test/ndbapi/bank/bankTimer.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "../Bank.hpp" +#include "Bank.hpp" int main(int argc, const char** argv){ diff --git a/ndb/test/ndbapi/bank/bankTransactionMaker/bankTransactionMaker.cpp b/ndb/test/ndbapi/bank/bankTransactionMaker.cpp similarity index 98% rename from ndb/test/ndbapi/bank/bankTransactionMaker/bankTransactionMaker.cpp rename to ndb/test/ndbapi/bank/bankTransactionMaker.cpp index 0c7d5d72473..fe9b53e0c8d 100644 --- a/ndb/test/ndbapi/bank/bankTransactionMaker/bankTransactionMaker.cpp +++ b/ndb/test/ndbapi/bank/bankTransactionMaker.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "../Bank.hpp" +#include "Bank.hpp" int main(int argc, const char** argv){ diff --git a/ndb/test/ndbapi/bank/bankValidateAllGLs/bankValidateAllGLs.cpp b/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp similarity index 98% rename from ndb/test/ndbapi/bank/bankValidateAllGLs/bankValidateAllGLs.cpp rename to ndb/test/ndbapi/bank/bankValidateAllGLs.cpp index 13136755de8..f9d974bb5f7 100644 --- a/ndb/test/ndbapi/bank/bankValidateAllGLs/bankValidateAllGLs.cpp +++ b/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "../Bank.hpp" +#include "Bank.hpp" int main(int argc, const char** argv){ diff --git a/ndb/test/ndbapi/bank/bankCreator/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankCreator/Makefile similarity index 100% rename from ndb/test/ndbapi/bank/bankCreator/Makefile rename to ndb/test/ndbapi/bank/old_dirs/bankCreator/Makefile diff --git a/ndb/test/ndbapi/bank/bankMakeGL/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankMakeGL/Makefile similarity index 100% rename from ndb/test/ndbapi/bank/bankMakeGL/Makefile rename to ndb/test/ndbapi/bank/old_dirs/bankMakeGL/Makefile diff --git a/ndb/test/ndbapi/bank/bankSumAccounts/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankSumAccounts/Makefile similarity index 100% rename from ndb/test/ndbapi/bank/bankSumAccounts/Makefile rename to ndb/test/ndbapi/bank/old_dirs/bankSumAccounts/Makefile diff --git a/ndb/test/ndbapi/bank/bankTimer/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankTimer/Makefile similarity index 100% rename from ndb/test/ndbapi/bank/bankTimer/Makefile rename to ndb/test/ndbapi/bank/old_dirs/bankTimer/Makefile diff --git a/ndb/test/ndbapi/bank/bankTransactionMaker/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankTransactionMaker/Makefile similarity index 100% rename from ndb/test/ndbapi/bank/bankTransactionMaker/Makefile rename to ndb/test/ndbapi/bank/old_dirs/bankTransactionMaker/Makefile diff --git a/ndb/test/ndbapi/bank/bankValidateAllGLs/Makefile b/ndb/test/ndbapi/bank/old_dirs/bankValidateAllGLs/Makefile similarity index 100% rename from ndb/test/ndbapi/bank/bankValidateAllGLs/Makefile rename to ndb/test/ndbapi/bank/old_dirs/bankValidateAllGLs/Makefile diff --git a/ndb/test/ndbapi/bank/src/Makefile b/ndb/test/ndbapi/bank/old_dirs/src/Makefile similarity index 100% rename from ndb/test/ndbapi/bank/src/Makefile rename to ndb/test/ndbapi/bank/old_dirs/src/Makefile diff --git a/ndb/test/ndbapi/bank/testBank/Makefile b/ndb/test/ndbapi/bank/old_dirs/testBank/Makefile similarity index 100% rename from ndb/test/ndbapi/bank/testBank/Makefile rename to ndb/test/ndbapi/bank/old_dirs/testBank/Makefile diff --git a/ndb/test/ndbapi/bank/testBank/testBank.cpp b/ndb/test/ndbapi/bank/testBank.cpp similarity index 99% rename from ndb/test/ndbapi/bank/testBank/testBank.cpp rename to ndb/test/ndbapi/bank/testBank.cpp index 094ecaa499c..77ac1172d7c 100644 --- a/ndb/test/ndbapi/bank/testBank/testBank.cpp +++ b/ndb/test/ndbapi/bank/testBank.cpp @@ -29,7 +29,7 @@ continue; } -#include "../Bank.hpp" +#include "Bank.hpp" int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){ Bank bank; diff --git a/ndb/test/ndbapi/ronja/benchronja/benchronja.cpp b/ndb/test/ndbapi/benchronja.cpp similarity index 100% rename from ndb/test/ndbapi/ronja/benchronja/benchronja.cpp rename to ndb/test/ndbapi/benchronja.cpp diff --git a/ndb/test/ndbapi/bulk_copy/bulk_copy.cpp b/ndb/test/ndbapi/bulk_copy.cpp similarity index 100% rename from ndb/test/ndbapi/bulk_copy/bulk_copy.cpp rename to ndb/test/ndbapi/bulk_copy.cpp diff --git a/ndb/test/ndbapi/vw_test/cdrserver.cpp b/ndb/test/ndbapi/cdrserver.cpp similarity index 100% rename from ndb/test/ndbapi/vw_test/cdrserver.cpp rename to ndb/test/ndbapi/cdrserver.cpp diff --git a/ndb/test/ndbapi/cello-sessionDb/celloDb.cpp b/ndb/test/ndbapi/celloDb.cpp similarity index 100% rename from ndb/test/ndbapi/cello-sessionDb/celloDb.cpp rename to ndb/test/ndbapi/celloDb.cpp diff --git a/ndb/test/ndbapi/create_all_tabs/create_all_tabs.cpp b/ndb/test/ndbapi/create_all_tabs.cpp similarity index 100% rename from ndb/test/ndbapi/create_all_tabs/create_all_tabs.cpp rename to ndb/test/ndbapi/create_all_tabs.cpp diff --git a/ndb/test/ndbapi/create_tab/create_tab.cpp b/ndb/test/ndbapi/create_tab.cpp similarity index 100% rename from ndb/test/ndbapi/create_tab/create_tab.cpp rename to ndb/test/ndbapi/create_tab.cpp diff --git a/ndb/test/ndbapi/drop_all_tabs/drop_all_tabs.cpp b/ndb/test/ndbapi/drop_all_tabs.cpp similarity index 100% rename from ndb/test/ndbapi/drop_all_tabs/drop_all_tabs.cpp rename to ndb/test/ndbapi/drop_all_tabs.cpp diff --git a/ndb/test/ndbapi/flexAsynch/flexAsynch.cpp b/ndb/test/ndbapi/flexAsynch.cpp similarity index 100% rename from ndb/test/ndbapi/flexAsynch/flexAsynch.cpp rename to ndb/test/ndbapi/flexAsynch.cpp diff --git a/ndb/test/ndbapi/flexBench/flexBench.cpp b/ndb/test/ndbapi/flexBench.cpp similarity index 100% rename from ndb/test/ndbapi/flexBench/flexBench.cpp rename to ndb/test/ndbapi/flexBench.cpp diff --git a/ndb/test/ndbapi/flexHammer/flexHammer.cpp b/ndb/test/ndbapi/flexHammer.cpp similarity index 100% rename from ndb/test/ndbapi/flexHammer/flexHammer.cpp rename to ndb/test/ndbapi/flexHammer.cpp diff --git a/ndb/test/ndbapi/flexScan/flexScan.cpp b/ndb/test/ndbapi/flexScan.cpp similarity index 100% rename from ndb/test/ndbapi/flexScan/flexScan.cpp rename to ndb/test/ndbapi/flexScan.cpp diff --git a/ndb/test/ndbapi/flexTT/flexTT.cpp b/ndb/test/ndbapi/flexTT.cpp similarity index 100% rename from ndb/test/ndbapi/flexTT/flexTT.cpp rename to ndb/test/ndbapi/flexTT.cpp diff --git a/ndb/test/ndbapi/flexTimedAsynch/flexTimedAsynch.cpp b/ndb/test/ndbapi/flexTimedAsynch.cpp similarity index 100% rename from ndb/test/ndbapi/flexTimedAsynch/flexTimedAsynch.cpp rename to ndb/test/ndbapi/flexTimedAsynch.cpp diff --git a/ndb/test/ndbapi/flex_bench_mysql/flex_bench_mysql.cpp b/ndb/test/ndbapi/flex_bench_mysql.cpp similarity index 100% rename from ndb/test/ndbapi/flex_bench_mysql/flex_bench_mysql.cpp rename to ndb/test/ndbapi/flex_bench_mysql.cpp diff --git a/ndb/test/ndbapi/indexTest/index.cpp b/ndb/test/ndbapi/index.cpp similarity index 100% rename from ndb/test/ndbapi/indexTest/index.cpp rename to ndb/test/ndbapi/index.cpp diff --git a/ndb/test/ndbapi/indexTest2/index2.cpp b/ndb/test/ndbapi/index2.cpp similarity index 100% rename from ndb/test/ndbapi/indexTest2/index2.cpp rename to ndb/test/ndbapi/index2.cpp diff --git a/ndb/test/ndbapi/ronja/initronja/initronja.cpp b/ndb/test/ndbapi/initronja.cpp similarity index 100% rename from ndb/test/ndbapi/ronja/initronja/initronja.cpp rename to ndb/test/ndbapi/initronja.cpp diff --git a/ndb/test/ndbapi/interpreterInTup/interpreterInTup.cpp b/ndb/test/ndbapi/interpreterInTup.cpp similarity index 100% rename from ndb/test/ndbapi/interpreterInTup/interpreterInTup.cpp rename to ndb/test/ndbapi/interpreterInTup.cpp diff --git a/ndb/test/ndbapi/lmc-bench/async-src/generator/mainAsyncGenerator.cpp b/ndb/test/ndbapi/mainAsyncGenerator.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/generator/mainAsyncGenerator.cpp rename to ndb/test/ndbapi/mainAsyncGenerator.cpp diff --git a/ndb/test/ndbapi/telco/msa.cpp b/ndb/test/ndbapi/msa.cpp similarity index 100% rename from ndb/test/ndbapi/telco/msa.cpp rename to ndb/test/ndbapi/msa.cpp diff --git a/ndb/test/ndbapi/lmc-bench/async-src/user/ndb_async1.cpp b/ndb/test/ndbapi/ndb_async1.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/user/ndb_async1.cpp rename to ndb/test/ndbapi/ndb_async1.cpp diff --git a/ndb/test/ndbapi/lmc-bench/async-src/user/ndb_async2.cpp b/ndb/test/ndbapi/ndb_async2.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/user/ndb_async2.cpp rename to ndb/test/ndbapi/ndb_async2.cpp diff --git a/ndb/test/ndbapi/lmc-bench/src/user/ndb_user_populate.cpp b/ndb/test/ndbapi/ndb_user_populate.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/ndb_user_populate.cpp rename to ndb/test/ndbapi/ndb_user_populate.cpp diff --git a/ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction.cpp b/ndb/test/ndbapi/ndb_user_transaction.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction.cpp rename to ndb/test/ndbapi/ndb_user_transaction.cpp diff --git a/ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction2.cpp b/ndb/test/ndbapi/ndb_user_transaction2.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction2.cpp rename to ndb/test/ndbapi/ndb_user_transaction2.cpp diff --git a/ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction3.cpp b/ndb/test/ndbapi/ndb_user_transaction3.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction3.cpp rename to ndb/test/ndbapi/ndb_user_transaction3.cpp diff --git a/ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction4.cpp b/ndb/test/ndbapi/ndb_user_transaction4.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction4.cpp rename to ndb/test/ndbapi/ndb_user_transaction4.cpp diff --git a/ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction5.cpp b/ndb/test/ndbapi/ndb_user_transaction5.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction5.cpp rename to ndb/test/ndbapi/ndb_user_transaction5.cpp diff --git a/ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction6.cpp b/ndb/test/ndbapi/ndb_user_transaction6.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction6.cpp rename to ndb/test/ndbapi/ndb_user_transaction6.cpp diff --git a/ndb/test/ndbapi/acid/Makefile b/ndb/test/ndbapi/old_dirs/acid/Makefile similarity index 100% rename from ndb/test/ndbapi/acid/Makefile rename to ndb/test/ndbapi/old_dirs/acid/Makefile diff --git a/ndb/test/ndbapi/acid2/Makefile b/ndb/test/ndbapi/old_dirs/acid2/Makefile similarity index 100% rename from ndb/test/ndbapi/acid2/Makefile rename to ndb/test/ndbapi/old_dirs/acid2/Makefile diff --git a/ndb/test/ndbapi/acid2/TraceNdbApi.hpp b/ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp similarity index 100% rename from ndb/test/ndbapi/acid2/TraceNdbApi.hpp rename to ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp diff --git a/ndb/test/ndbapi/acid2/VerifyNdbApi.hpp b/ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp similarity index 100% rename from ndb/test/ndbapi/acid2/VerifyNdbApi.hpp rename to ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp diff --git a/ndb/test/ndbapi/basicAsynch/Makefile b/ndb/test/ndbapi/old_dirs/basicAsynch/Makefile similarity index 100% rename from ndb/test/ndbapi/basicAsynch/Makefile rename to ndb/test/ndbapi/old_dirs/basicAsynch/Makefile diff --git a/ndb/test/ndbapi/bulk_copy/Makefile b/ndb/test/ndbapi/old_dirs/bulk_copy/Makefile similarity index 100% rename from ndb/test/ndbapi/bulk_copy/Makefile rename to ndb/test/ndbapi/old_dirs/bulk_copy/Makefile diff --git a/ndb/test/ndbapi/create_all_tabs/Makefile b/ndb/test/ndbapi/old_dirs/create_all_tabs/Makefile similarity index 100% rename from ndb/test/ndbapi/create_all_tabs/Makefile rename to ndb/test/ndbapi/old_dirs/create_all_tabs/Makefile diff --git a/ndb/test/ndbapi/create_tab/Makefile b/ndb/test/ndbapi/old_dirs/create_tab/Makefile similarity index 100% rename from ndb/test/ndbapi/create_tab/Makefile rename to ndb/test/ndbapi/old_dirs/create_tab/Makefile diff --git a/ndb/test/ndbapi/drop_all_tabs/Makefile b/ndb/test/ndbapi/old_dirs/drop_all_tabs/Makefile similarity index 100% rename from ndb/test/ndbapi/drop_all_tabs/Makefile rename to ndb/test/ndbapi/old_dirs/drop_all_tabs/Makefile diff --git a/ndb/test/ndbapi/flexAsynch/Makefile b/ndb/test/ndbapi/old_dirs/flexAsynch/Makefile similarity index 100% rename from ndb/test/ndbapi/flexAsynch/Makefile rename to ndb/test/ndbapi/old_dirs/flexAsynch/Makefile diff --git a/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am b/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am new file mode 100644 index 00000000000..d4de4b92b60 --- /dev/null +++ b/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am @@ -0,0 +1,10 @@ + +bin_PROGRAMS = flexBench + +flexBench_SOURCES = flexBench.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/test/ndbapi/flexBench/Makefile b/ndb/test/ndbapi/old_dirs/flexBench/Makefile_old similarity index 100% rename from ndb/test/ndbapi/flexBench/Makefile rename to ndb/test/ndbapi/old_dirs/flexBench/Makefile_old diff --git a/ndb/test/ndbapi/flexBench/ndbplot.pl b/ndb/test/ndbapi/old_dirs/flexBench/ndbplot.pl similarity index 100% rename from ndb/test/ndbapi/flexBench/ndbplot.pl rename to ndb/test/ndbapi/old_dirs/flexBench/ndbplot.pl diff --git a/ndb/test/ndbapi/flexHammer/Makefile b/ndb/test/ndbapi/old_dirs/flexHammer/Makefile similarity index 100% rename from ndb/test/ndbapi/flexHammer/Makefile rename to ndb/test/ndbapi/old_dirs/flexHammer/Makefile diff --git a/ndb/test/ndbapi/flexHammer/README b/ndb/test/ndbapi/old_dirs/flexHammer/README similarity index 100% rename from ndb/test/ndbapi/flexHammer/README rename to ndb/test/ndbapi/old_dirs/flexHammer/README diff --git a/ndb/test/ndbapi/flexScan/Makefile b/ndb/test/ndbapi/old_dirs/flexScan/Makefile similarity index 100% rename from ndb/test/ndbapi/flexScan/Makefile rename to ndb/test/ndbapi/old_dirs/flexScan/Makefile diff --git a/ndb/test/ndbapi/flexScan/README b/ndb/test/ndbapi/old_dirs/flexScan/README similarity index 100% rename from ndb/test/ndbapi/flexScan/README rename to ndb/test/ndbapi/old_dirs/flexScan/README diff --git a/ndb/test/ndbapi/flexTT/Makefile b/ndb/test/ndbapi/old_dirs/flexTT/Makefile similarity index 100% rename from ndb/test/ndbapi/flexTT/Makefile rename to ndb/test/ndbapi/old_dirs/flexTT/Makefile diff --git a/ndb/test/ndbapi/flexTimedAsynch/Makefile b/ndb/test/ndbapi/old_dirs/flexTimedAsynch/Makefile similarity index 100% rename from ndb/test/ndbapi/flexTimedAsynch/Makefile rename to ndb/test/ndbapi/old_dirs/flexTimedAsynch/Makefile diff --git a/ndb/test/ndbapi/flex_bench_mysql/Makefile b/ndb/test/ndbapi/old_dirs/flex_bench_mysql/Makefile similarity index 100% rename from ndb/test/ndbapi/flex_bench_mysql/Makefile rename to ndb/test/ndbapi/old_dirs/flex_bench_mysql/Makefile diff --git a/ndb/test/ndbapi/indexTest/Makefile b/ndb/test/ndbapi/old_dirs/indexTest/Makefile similarity index 100% rename from ndb/test/ndbapi/indexTest/Makefile rename to ndb/test/ndbapi/old_dirs/indexTest/Makefile diff --git a/ndb/test/ndbapi/indexTest2/Makefile b/ndb/test/ndbapi/old_dirs/indexTest2/Makefile similarity index 100% rename from ndb/test/ndbapi/indexTest2/Makefile rename to ndb/test/ndbapi/old_dirs/indexTest2/Makefile diff --git a/ndb/test/ndbapi/interpreterInTup/Makefile b/ndb/test/ndbapi/old_dirs/interpreterInTup/Makefile similarity index 100% rename from ndb/test/ndbapi/interpreterInTup/Makefile rename to ndb/test/ndbapi/old_dirs/interpreterInTup/Makefile diff --git a/ndb/test/ndbapi/lmc-bench/Makefile b/ndb/test/ndbapi/old_dirs/lmc-bench/Makefile similarity index 100% rename from ndb/test/ndbapi/lmc-bench/Makefile rename to ndb/test/ndbapi/old_dirs/lmc-bench/Makefile diff --git a/ndb/test/ndbapi/lmc-bench/async-src/Makefile b/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/Makefile rename to ndb/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile diff --git a/ndb/test/ndbapi/lmc-bench/async-src/generator/Makefile b/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/generator/Makefile rename to ndb/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile diff --git a/ndb/test/ndbapi/lmc-bench/async-src/include/dbGenerator.h b/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/include/dbGenerator.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h diff --git a/ndb/test/ndbapi/lmc-bench/async-src/include/testData.h b/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/include/testData.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h diff --git a/ndb/test/ndbapi/lmc-bench/async-src/include/userInterface.h b/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/include/userInterface.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h diff --git a/ndb/test/ndbapi/lmc-bench/async-src/user/Makefile b/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/user/Makefile rename to ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile diff --git a/ndb/test/ndbapi/lmc-bench/async-src/user/macros.h b/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/user/macros.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h diff --git a/ndb/test/ndbapi/lmc-bench/async-src/user/ndb_error.hpp b/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/user/ndb_error.hpp rename to ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp diff --git a/ndb/test/ndbapi/lmc-bench/bin/.empty b/ndb/test/ndbapi/old_dirs/lmc-bench/bin/.empty similarity index 100% rename from ndb/test/ndbapi/lmc-bench/bin/.empty rename to ndb/test/ndbapi/old_dirs/lmc-bench/bin/.empty diff --git a/ndb/test/ndbapi/lmc-bench/include/ndb_schema.hpp b/ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/include/ndb_schema.hpp rename to ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp diff --git a/ndb/test/ndbapi/lmc-bench/include/testDefinitions.h b/ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/include/testDefinitions.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h diff --git a/ndb/test/ndbapi/lmc-bench/lib/.empty b/ndb/test/ndbapi/old_dirs/lmc-bench/lib/.empty similarity index 100% rename from ndb/test/ndbapi/lmc-bench/lib/.empty rename to ndb/test/ndbapi/old_dirs/lmc-bench/lib/.empty diff --git a/ndb/test/ndbapi/lmc-bench/script/Makefile b/ndb/test/ndbapi/old_dirs/lmc-bench/script/Makefile similarity index 100% rename from ndb/test/ndbapi/lmc-bench/script/Makefile rename to ndb/test/ndbapi/old_dirs/lmc-bench/script/Makefile diff --git a/ndb/test/ndbapi/lmc-bench/script/async-lmc-bench-l-p10.sh b/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh similarity index 100% rename from ndb/test/ndbapi/lmc-bench/script/async-lmc-bench-l-p10.sh rename to ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh diff --git a/ndb/test/ndbapi/lmc-bench/script/async-lmc-bench-l.sh b/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh similarity index 100% rename from ndb/test/ndbapi/lmc-bench/script/async-lmc-bench-l.sh rename to ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh diff --git a/ndb/test/ndbapi/lmc-bench/script/async-lmc-bench-p10.sh b/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh similarity index 100% rename from ndb/test/ndbapi/lmc-bench/script/async-lmc-bench-p10.sh rename to ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh diff --git a/ndb/test/ndbapi/lmc-bench/script/async-lmc-bench.sh b/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh similarity index 100% rename from ndb/test/ndbapi/lmc-bench/script/async-lmc-bench.sh rename to ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh diff --git a/ndb/test/ndbapi/lmc-bench/src/Makefile b/ndb/test/ndbapi/old_dirs/lmc-bench/src/Makefile similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/Makefile rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/Makefile diff --git a/ndb/test/ndbapi/lmc-bench/src/README b/ndb/test/ndbapi/old_dirs/lmc-bench/src/README similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/README rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/README diff --git a/ndb/test/ndbapi/lmc-bench/src/generator/Makefile b/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/generator/Makefile rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile diff --git a/ndb/test/ndbapi/lmc-bench/src/generator/dbGenerator.c b/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/generator/dbGenerator.c rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c diff --git a/ndb/test/ndbapi/lmc-bench/src/generator/dbGenerator.h b/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/generator/dbGenerator.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h diff --git a/ndb/test/ndbapi/lmc-bench/src/generator/mainGenerator.c b/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/generator/mainGenerator.c rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c diff --git a/ndb/test/ndbapi/lmc-bench/src/include/testData.h b/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/include/testData.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h diff --git a/ndb/test/ndbapi/lmc-bench/src/include/userInterface.h b/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/include/userInterface.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h diff --git a/ndb/test/ndbapi/lmc-bench/src/makevars.linux b/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/makevars.linux rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux diff --git a/ndb/test/ndbapi/lmc-bench/src/makevars.sparc b/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/makevars.sparc rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc diff --git a/ndb/test/ndbapi/lmc-bench/src/populator/Makefile b/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/populator/Makefile rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile diff --git a/ndb/test/ndbapi/lmc-bench/src/populator/dbPopulate.c b/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/populator/dbPopulate.c rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c diff --git a/ndb/test/ndbapi/lmc-bench/src/populator/dbPopulate.h b/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/populator/dbPopulate.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h diff --git a/ndb/test/ndbapi/lmc-bench/src/populator/mainPopulate.c b/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/populator/mainPopulate.c rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c diff --git a/ndb/test/ndbapi/lmc-bench/src/user/Makefile b/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/Makefile rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile diff --git a/ndb/test/ndbapi/lmc-bench/src/user/localDbPrepare.c b/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/localDbPrepare.c rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c diff --git a/ndb/test/ndbapi/lmc-bench/src/user/macros.h b/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/macros.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h diff --git a/ndb/test/ndbapi/lmc-bench/src/user/ndb_error.hpp b/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/ndb_error.hpp rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp diff --git a/ndb/test/ndbapi/lmc-bench/src/user/old/Makefile b/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/old/Makefile rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile diff --git a/ndb/test/ndbapi/lmc-bench/src/user/old/userHandle.h b/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/old/userHandle.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h diff --git a/ndb/test/ndbapi/lmc-bench/src/user/old/userInterface.c b/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/old/userInterface.c rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c diff --git a/ndb/test/ndbapi/lmc-bench/src/user/old/userTransaction.c b/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/old/userTransaction.c rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c diff --git a/ndb/test/ndbapi/lmc-bench/src/user/userHandle.h b/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/userHandle.h rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h diff --git a/ndb/test/ndbapi/lmc-bench/src/user/userInterface.cpp b/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/userInterface.cpp rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp diff --git a/ndb/test/ndbapi/lmc-bench/src/user/userTransaction.c b/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c similarity index 100% rename from ndb/test/ndbapi/lmc-bench/src/user/userTransaction.c rename to ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c diff --git a/ndb/test/ndbapi/restarter/Makefile b/ndb/test/ndbapi/old_dirs/restarter/Makefile similarity index 100% rename from ndb/test/ndbapi/restarter/Makefile rename to ndb/test/ndbapi/old_dirs/restarter/Makefile diff --git a/ndb/test/ndbapi/restarter2/Makefile b/ndb/test/ndbapi/old_dirs/restarter2/Makefile similarity index 100% rename from ndb/test/ndbapi/restarter2/Makefile rename to ndb/test/ndbapi/old_dirs/restarter2/Makefile diff --git a/ndb/test/ndbapi/restarts/Makefile b/ndb/test/ndbapi/old_dirs/restarts/Makefile similarity index 100% rename from ndb/test/ndbapi/restarts/Makefile rename to ndb/test/ndbapi/old_dirs/restarts/Makefile diff --git a/ndb/test/ndbapi/ronja/Makefile b/ndb/test/ndbapi/old_dirs/ronja/Makefile similarity index 100% rename from ndb/test/ndbapi/ronja/Makefile rename to ndb/test/ndbapi/old_dirs/ronja/Makefile diff --git a/ndb/test/ndbapi/ronja/benchronja/Makefile b/ndb/test/ndbapi/old_dirs/ronja/benchronja/Makefile similarity index 100% rename from ndb/test/ndbapi/ronja/benchronja/Makefile rename to ndb/test/ndbapi/old_dirs/ronja/benchronja/Makefile diff --git a/ndb/test/ndbapi/ronja/initronja/Makefile b/ndb/test/ndbapi/old_dirs/ronja/initronja/Makefile similarity index 100% rename from ndb/test/ndbapi/ronja/initronja/Makefile rename to ndb/test/ndbapi/old_dirs/ronja/initronja/Makefile diff --git a/ndb/test/ndbapi/telco/Makefile b/ndb/test/ndbapi/old_dirs/telco/Makefile similarity index 100% rename from ndb/test/ndbapi/telco/Makefile rename to ndb/test/ndbapi/old_dirs/telco/Makefile diff --git a/ndb/test/ndbapi/telco/readme b/ndb/test/ndbapi/old_dirs/telco/readme similarity index 100% rename from ndb/test/ndbapi/telco/readme rename to ndb/test/ndbapi/old_dirs/telco/readme diff --git a/ndb/test/ndbapi/testBackup/Makefile b/ndb/test/ndbapi/old_dirs/testBackup/Makefile similarity index 100% rename from ndb/test/ndbapi/testBackup/Makefile rename to ndb/test/ndbapi/old_dirs/testBackup/Makefile diff --git a/ndb/test/ndbapi/testBasic/Makefile b/ndb/test/ndbapi/old_dirs/testBasic/Makefile similarity index 100% rename from ndb/test/ndbapi/testBasic/Makefile rename to ndb/test/ndbapi/old_dirs/testBasic/Makefile diff --git a/ndb/test/ndbapi/testBlobs/Makefile b/ndb/test/ndbapi/old_dirs/testBlobs/Makefile similarity index 100% rename from ndb/test/ndbapi/testBlobs/Makefile rename to ndb/test/ndbapi/old_dirs/testBlobs/Makefile diff --git a/ndb/test/ndbapi/testDataBuffers/Makefile b/ndb/test/ndbapi/old_dirs/testDataBuffers/Makefile similarity index 100% rename from ndb/test/ndbapi/testDataBuffers/Makefile rename to ndb/test/ndbapi/old_dirs/testDataBuffers/Makefile diff --git a/ndb/test/ndbapi/testDict/Makefile b/ndb/test/ndbapi/old_dirs/testDict/Makefile similarity index 100% rename from ndb/test/ndbapi/testDict/Makefile rename to ndb/test/ndbapi/old_dirs/testDict/Makefile diff --git a/ndb/test/ndbapi/testGrep/Makefile b/ndb/test/ndbapi/old_dirs/testGrep/Makefile similarity index 100% rename from ndb/test/ndbapi/testGrep/Makefile rename to ndb/test/ndbapi/old_dirs/testGrep/Makefile diff --git a/ndb/test/ndbapi/testGrep/verify/Makefile b/ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile similarity index 100% rename from ndb/test/ndbapi/testGrep/verify/Makefile rename to ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile diff --git a/ndb/test/ndbapi/testIndex/Makefile b/ndb/test/ndbapi/old_dirs/testIndex/Makefile similarity index 100% rename from ndb/test/ndbapi/testIndex/Makefile rename to ndb/test/ndbapi/old_dirs/testIndex/Makefile diff --git a/ndb/test/ndbapi/testInterpreter/Makefile b/ndb/test/ndbapi/old_dirs/testInterpreter/Makefile similarity index 100% rename from ndb/test/ndbapi/testInterpreter/Makefile rename to ndb/test/ndbapi/old_dirs/testInterpreter/Makefile diff --git a/ndb/test/ndbapi/testMgm/Makefile b/ndb/test/ndbapi/old_dirs/testMgm/Makefile similarity index 100% rename from ndb/test/ndbapi/testMgm/Makefile rename to ndb/test/ndbapi/old_dirs/testMgm/Makefile diff --git a/ndb/test/ndbapi/testNdbApi/Makefile b/ndb/test/ndbapi/old_dirs/testNdbApi/Makefile similarity index 100% rename from ndb/test/ndbapi/testNdbApi/Makefile rename to ndb/test/ndbapi/old_dirs/testNdbApi/Makefile diff --git a/ndb/test/ndbapi/testNodeRestart/Makefile b/ndb/test/ndbapi/old_dirs/testNodeRestart/Makefile similarity index 100% rename from ndb/test/ndbapi/testNodeRestart/Makefile rename to ndb/test/ndbapi/old_dirs/testNodeRestart/Makefile diff --git a/ndb/test/ndbapi/testOIBasic/Makefile b/ndb/test/ndbapi/old_dirs/testOIBasic/Makefile similarity index 100% rename from ndb/test/ndbapi/testOIBasic/Makefile rename to ndb/test/ndbapi/old_dirs/testOIBasic/Makefile diff --git a/ndb/test/ndbapi/testOIBasic/times.txt b/ndb/test/ndbapi/old_dirs/testOIBasic/times.txt similarity index 100% rename from ndb/test/ndbapi/testOIBasic/times.txt rename to ndb/test/ndbapi/old_dirs/testOIBasic/times.txt diff --git a/ndb/test/ndbapi/testOperations/Makefile b/ndb/test/ndbapi/old_dirs/testOperations/Makefile similarity index 100% rename from ndb/test/ndbapi/testOperations/Makefile rename to ndb/test/ndbapi/old_dirs/testOperations/Makefile diff --git a/ndb/test/ndbapi/testOrderedIndex/Makefile b/ndb/test/ndbapi/old_dirs/testOrderedIndex/Makefile similarity index 100% rename from ndb/test/ndbapi/testOrderedIndex/Makefile rename to ndb/test/ndbapi/old_dirs/testOrderedIndex/Makefile diff --git a/ndb/test/ndbapi/testRestartGci/Makefile b/ndb/test/ndbapi/old_dirs/testRestartGci/Makefile similarity index 100% rename from ndb/test/ndbapi/testRestartGci/Makefile rename to ndb/test/ndbapi/old_dirs/testRestartGci/Makefile diff --git a/ndb/test/ndbapi/testScan/Makefile b/ndb/test/ndbapi/old_dirs/testScan/Makefile similarity index 100% rename from ndb/test/ndbapi/testScan/Makefile rename to ndb/test/ndbapi/old_dirs/testScan/Makefile diff --git a/ndb/test/ndbapi/testScanInterpreter/Makefile b/ndb/test/ndbapi/old_dirs/testScanInterpreter/Makefile similarity index 100% rename from ndb/test/ndbapi/testScanInterpreter/Makefile rename to ndb/test/ndbapi/old_dirs/testScanInterpreter/Makefile diff --git a/ndb/test/ndbapi/testSystemRestart/Makefile b/ndb/test/ndbapi/old_dirs/testSystemRestart/Makefile similarity index 100% rename from ndb/test/ndbapi/testSystemRestart/Makefile rename to ndb/test/ndbapi/old_dirs/testSystemRestart/Makefile diff --git a/ndb/test/ndbapi/testTimeout/Makefile b/ndb/test/ndbapi/old_dirs/testTimeout/Makefile similarity index 100% rename from ndb/test/ndbapi/testTimeout/Makefile rename to ndb/test/ndbapi/old_dirs/testTimeout/Makefile diff --git a/ndb/test/ndbapi/testTransactions/Makefile b/ndb/test/ndbapi/old_dirs/testTransactions/Makefile similarity index 100% rename from ndb/test/ndbapi/testTransactions/Makefile rename to ndb/test/ndbapi/old_dirs/testTransactions/Makefile diff --git a/ndb/test/ndbapi/test_event/Makefile b/ndb/test/ndbapi/old_dirs/test_event/Makefile similarity index 100% rename from ndb/test/ndbapi/test_event/Makefile rename to ndb/test/ndbapi/old_dirs/test_event/Makefile diff --git a/ndb/test/ndbapi/vw_test/Makefile b/ndb/test/ndbapi/old_dirs/vw_test/Makefile similarity index 100% rename from ndb/test/ndbapi/vw_test/Makefile rename to ndb/test/ndbapi/old_dirs/vw_test/Makefile diff --git a/ndb/test/ndbapi/vw_test/bcd.h b/ndb/test/ndbapi/old_dirs/vw_test/bcd.h similarity index 100% rename from ndb/test/ndbapi/vw_test/bcd.h rename to ndb/test/ndbapi/old_dirs/vw_test/bcd.h diff --git a/ndb/test/ndbapi/vw_test/script/client_start b/ndb/test/ndbapi/old_dirs/vw_test/script/client_start similarity index 100% rename from ndb/test/ndbapi/vw_test/script/client_start rename to ndb/test/ndbapi/old_dirs/vw_test/script/client_start diff --git a/ndb/test/ndbapi/vw_test/utv.h b/ndb/test/ndbapi/old_dirs/vw_test/utv.h similarity index 100% rename from ndb/test/ndbapi/vw_test/utv.h rename to ndb/test/ndbapi/old_dirs/vw_test/utv.h diff --git a/ndb/test/ndbapi/vw_test/vcdrfunc.h b/ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h similarity index 100% rename from ndb/test/ndbapi/vw_test/vcdrfunc.h rename to ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h diff --git a/ndb/test/ndbapi/restarter/restarter.cpp b/ndb/test/ndbapi/restarter.cpp similarity index 100% rename from ndb/test/ndbapi/restarter/restarter.cpp rename to ndb/test/ndbapi/restarter.cpp diff --git a/ndb/test/ndbapi/restarter2/restarter2.cpp b/ndb/test/ndbapi/restarter2.cpp similarity index 100% rename from ndb/test/ndbapi/restarter2/restarter2.cpp rename to ndb/test/ndbapi/restarter2.cpp diff --git a/ndb/test/ndbapi/restarts/restarts.cpp b/ndb/test/ndbapi/restarts.cpp similarity index 100% rename from ndb/test/ndbapi/restarts/restarts.cpp rename to ndb/test/ndbapi/restarts.cpp diff --git a/ndb/test/ndbapi/vw_test/size.cpp b/ndb/test/ndbapi/size.cpp similarity index 100% rename from ndb/test/ndbapi/vw_test/size.cpp rename to ndb/test/ndbapi/size.cpp diff --git a/ndb/test/ndbapi/testBackup/testBackup.cpp b/ndb/test/ndbapi/testBackup.cpp similarity index 99% rename from ndb/test/ndbapi/testBackup/testBackup.cpp rename to ndb/test/ndbapi/testBackup.cpp index f9ae7ffcbbc..129eced54b0 100644 --- a/ndb/test/ndbapi/testBackup/testBackup.cpp +++ b/ndb/test/ndbapi/testBackup.cpp @@ -205,8 +205,7 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){ return NDBT_OK; } - -#include "../bank/Bank.hpp" +#include "bank/Bank.hpp" int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){ Bank bank; diff --git a/ndb/test/ndbapi/testBasic/testBasic.cpp b/ndb/test/ndbapi/testBasic.cpp similarity index 100% rename from ndb/test/ndbapi/testBasic/testBasic.cpp rename to ndb/test/ndbapi/testBasic.cpp diff --git a/ndb/test/ndbapi/basicAsynch/testBasicAsynch.cpp b/ndb/test/ndbapi/testBasicAsynch.cpp old mode 100755 new mode 100644 similarity index 100% rename from ndb/test/ndbapi/basicAsynch/testBasicAsynch.cpp rename to ndb/test/ndbapi/testBasicAsynch.cpp diff --git a/ndb/test/ndbapi/testBlobs/testBlobs.cpp b/ndb/test/ndbapi/testBlobs.cpp similarity index 99% rename from ndb/test/ndbapi/testBlobs/testBlobs.cpp rename to ndb/test/ndbapi/testBlobs.cpp index 9f959702402..e2be1def71c 100644 --- a/ndb/test/ndbapi/testBlobs/testBlobs.cpp +++ b/ndb/test/ndbapi/testBlobs.cpp @@ -27,7 +27,6 @@ #include #include #include -#include struct Opt { bool m_core; diff --git a/ndb/test/ndbapi/testDataBuffers/testDataBuffers.cpp b/ndb/test/ndbapi/testDataBuffers.cpp similarity index 100% rename from ndb/test/ndbapi/testDataBuffers/testDataBuffers.cpp rename to ndb/test/ndbapi/testDataBuffers.cpp diff --git a/ndb/test/ndbapi/testDict/testDict.cpp b/ndb/test/ndbapi/testDict.cpp similarity index 100% rename from ndb/test/ndbapi/testDict/testDict.cpp rename to ndb/test/ndbapi/testDict.cpp diff --git a/ndb/test/ndbapi/testGrep/testGrep.cpp b/ndb/test/ndbapi/testGrep.cpp similarity index 100% rename from ndb/test/ndbapi/testGrep/testGrep.cpp rename to ndb/test/ndbapi/testGrep.cpp diff --git a/ndb/test/ndbapi/testGrep/verify/testGrepVerify.cpp b/ndb/test/ndbapi/testGrepVerify.cpp similarity index 100% rename from ndb/test/ndbapi/testGrep/verify/testGrepVerify.cpp rename to ndb/test/ndbapi/testGrepVerify.cpp diff --git a/ndb/test/ndbapi/testIndex/testIndex.cpp b/ndb/test/ndbapi/testIndex.cpp similarity index 100% rename from ndb/test/ndbapi/testIndex/testIndex.cpp rename to ndb/test/ndbapi/testIndex.cpp diff --git a/ndb/test/ndbapi/testInterpreter/testInterpreter.cpp b/ndb/test/ndbapi/testInterpreter.cpp similarity index 100% rename from ndb/test/ndbapi/testInterpreter/testInterpreter.cpp rename to ndb/test/ndbapi/testInterpreter.cpp diff --git a/ndb/test/ndbapi/testMgm/testMgm.cpp b/ndb/test/ndbapi/testMgm.cpp similarity index 100% rename from ndb/test/ndbapi/testMgm/testMgm.cpp rename to ndb/test/ndbapi/testMgm.cpp diff --git a/ndb/test/ndbapi/testNdbApi/testNdbApi.cpp b/ndb/test/ndbapi/testNdbApi.cpp similarity index 100% rename from ndb/test/ndbapi/testNdbApi/testNdbApi.cpp rename to ndb/test/ndbapi/testNdbApi.cpp diff --git a/ndb/test/ndbapi/testNodeRestart/testNodeRestart.cpp b/ndb/test/ndbapi/testNodeRestart.cpp similarity index 100% rename from ndb/test/ndbapi/testNodeRestart/testNodeRestart.cpp rename to ndb/test/ndbapi/testNodeRestart.cpp diff --git a/ndb/test/ndbapi/testOIBasic/testOIBasic.cpp b/ndb/test/ndbapi/testOIBasic.cpp similarity index 100% rename from ndb/test/ndbapi/testOIBasic/testOIBasic.cpp rename to ndb/test/ndbapi/testOIBasic.cpp diff --git a/ndb/test/ndbapi/testOperations/testOperations.cpp b/ndb/test/ndbapi/testOperations.cpp similarity index 100% rename from ndb/test/ndbapi/testOperations/testOperations.cpp rename to ndb/test/ndbapi/testOperations.cpp diff --git a/ndb/test/ndbapi/testOrderedIndex/testOrderedIndex.cpp b/ndb/test/ndbapi/testOrderedIndex.cpp similarity index 100% rename from ndb/test/ndbapi/testOrderedIndex/testOrderedIndex.cpp rename to ndb/test/ndbapi/testOrderedIndex.cpp diff --git a/ndb/test/ndbapi/testRestartGci/testRestartGci.cpp b/ndb/test/ndbapi/testRestartGci.cpp similarity index 100% rename from ndb/test/ndbapi/testRestartGci/testRestartGci.cpp rename to ndb/test/ndbapi/testRestartGci.cpp diff --git a/ndb/test/ndbapi/testScan/testScan.cpp b/ndb/test/ndbapi/testScan.cpp similarity index 100% rename from ndb/test/ndbapi/testScan/testScan.cpp rename to ndb/test/ndbapi/testScan.cpp diff --git a/ndb/test/ndbapi/testScanInterpreter/testScanInterpreter.cpp b/ndb/test/ndbapi/testScanInterpreter.cpp similarity index 100% rename from ndb/test/ndbapi/testScanInterpreter/testScanInterpreter.cpp rename to ndb/test/ndbapi/testScanInterpreter.cpp diff --git a/ndb/test/ndbapi/testSystemRestart/testSystemRestart.cpp b/ndb/test/ndbapi/testSystemRestart.cpp similarity index 100% rename from ndb/test/ndbapi/testSystemRestart/testSystemRestart.cpp rename to ndb/test/ndbapi/testSystemRestart.cpp diff --git a/ndb/test/ndbapi/testTimeout/testTimeout.cpp b/ndb/test/ndbapi/testTimeout.cpp similarity index 100% rename from ndb/test/ndbapi/testTimeout/testTimeout.cpp rename to ndb/test/ndbapi/testTimeout.cpp diff --git a/ndb/test/ndbapi/testTransactions/testTransactions.cpp b/ndb/test/ndbapi/testTransactions.cpp similarity index 100% rename from ndb/test/ndbapi/testTransactions/testTransactions.cpp rename to ndb/test/ndbapi/testTransactions.cpp diff --git a/ndb/test/ndbapi/test_event/test_event.cpp b/ndb/test/ndbapi/test_event.cpp similarity index 100% rename from ndb/test/ndbapi/test_event/test_event.cpp rename to ndb/test/ndbapi/test_event.cpp diff --git a/ndb/test/ndbapi/lmc-bench/async-src/user/userInterface.cpp b/ndb/test/ndbapi/userInterface.cpp similarity index 100% rename from ndb/test/ndbapi/lmc-bench/async-src/user/userInterface.cpp rename to ndb/test/ndbapi/userInterface.cpp diff --git a/ndb/test/run-test/Makefile.am b/ndb/test/run-test/Makefile.am new file mode 100644 index 00000000000..7a7db16ceae --- /dev/null +++ b/ndb/test/run-test/Makefile.am @@ -0,0 +1,16 @@ + +bin_PROGRAMS = atrt + +atrt_SOURCES = main.cpp + +bin_SCRIPTS = atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \ + atrt-clear-result.sh make-config.sh + +INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/mgmclient +LDADD_LOC = $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la $(top_srcdir)/ndb/src/mgmclient/CpcClient.o + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_util.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/test/run-test/Makefile b/ndb/test/run-test/Makefile_old similarity index 100% rename from ndb/test/run-test/Makefile rename to ndb/test/run-test/Makefile_old diff --git a/ndb/test/src/Makefile.am b/ndb/test/src/Makefile.am new file mode 100644 index 00000000000..3a9fc7b6de0 --- /dev/null +++ b/ndb/test/src/Makefile.am @@ -0,0 +1,18 @@ + +noinst_LIBRARIES = libNDBT.a + +libNDBT_a_SOURCES = \ + NDBT_ReturnCodes.cpp \ + NDBT_Error.cpp NDBT_Tables.cpp NDBT_ResultRow.cpp \ + NDBT_Test.cpp HugoCalculator.cpp \ + HugoOperations.cpp HugoTransactions.cpp \ + HugoAsynchTransactions.cpp UtilTransactions.cpp \ + NdbRestarter.cpp NdbRestarts.cpp NDBT_Output.cpp \ + NdbBackup.cpp NdbConfig.cpp NdbGrep.cpp NDBT_Table.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am +INCLUDES += -I$(top_srcdir)/ndb/src/common/mgmcommon -I$(top_srcdir)/ndb/include/mgmcommon -I$(top_srcdir)/ndb/include/kernel + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/test/src/Makefile b/ndb/test/src/Makefile_old similarity index 100% rename from ndb/test/src/Makefile rename to ndb/test/src/Makefile_old diff --git a/ndb/test/tools/Makefile.am b/ndb/test/tools/Makefile.am new file mode 100644 index 00000000000..554a37821fd --- /dev/null +++ b/ndb/test/tools/Makefile.am @@ -0,0 +1,29 @@ + +bin_PROGRAMS = waiter hugoCalculator hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index + +# ndb_cpcc +# transproxy + +hugoCalculator_SOURCES = hugoCalculator.cpp +hugoFill_SOURCES = hugoFill.cpp +hugoLoad_SOURCES = hugoLoad.cpp +hugoLockRecords_SOURCES = hugoLockRecords.cpp +hugoPkDelete_SOURCES = hugoPkDelete.cpp +hugoPkRead_SOURCES = hugoPkRead.cpp +hugoPkReadRecord_SOURCES = hugoPkReadRecord.cpp +hugoPkUpdate_SOURCES = hugoPkUpdate.cpp +hugoScanRead_SOURCES = hugoScanRead.cpp +hugoScanUpdate_SOURCES = hugoScanUpdate.cpp +restart_SOURCES = restart.cpp +waiter_SOURCES = waiter.cpp +# transproxy_SOURCES = transproxy.cpp +verify_index_SOURCES = verify_index.cpp +copy_tab_SOURCES = copy_tab.cpp +create_index_SOURCES = create_index.cpp +#ndb_cpcc_SOURCES = cpcc.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/test/tools/Makefile b/ndb/test/tools/Makefile_old similarity index 100% rename from ndb/test/tools/Makefile rename to ndb/test/tools/Makefile_old diff --git a/ndb/tools/copy_tab/copy_tab.cpp b/ndb/test/tools/copy_tab.cpp similarity index 100% rename from ndb/tools/copy_tab/copy_tab.cpp rename to ndb/test/tools/copy_tab.cpp diff --git a/ndb/tools/cpcc/cpcc.cpp b/ndb/test/tools/cpcc.cpp similarity index 100% rename from ndb/tools/cpcc/cpcc.cpp rename to ndb/test/tools/cpcc.cpp diff --git a/ndb/tools/create_index/create_index.cpp b/ndb/test/tools/create_index.cpp similarity index 100% rename from ndb/tools/create_index/create_index.cpp rename to ndb/test/tools/create_index.cpp diff --git a/ndb/test/tools/hugoCalculator/hugoCalculator.cpp b/ndb/test/tools/hugoCalculator.cpp similarity index 100% rename from ndb/test/tools/hugoCalculator/hugoCalculator.cpp rename to ndb/test/tools/hugoCalculator.cpp diff --git a/ndb/test/tools/hugoFill/hugoFill.cpp b/ndb/test/tools/hugoFill.cpp similarity index 100% rename from ndb/test/tools/hugoFill/hugoFill.cpp rename to ndb/test/tools/hugoFill.cpp diff --git a/ndb/test/tools/hugoLoad/hugoLoad.cpp b/ndb/test/tools/hugoLoad.cpp similarity index 100% rename from ndb/test/tools/hugoLoad/hugoLoad.cpp rename to ndb/test/tools/hugoLoad.cpp diff --git a/ndb/test/tools/hugoLockRecords/hugoLockRecords.cpp b/ndb/test/tools/hugoLockRecords.cpp similarity index 100% rename from ndb/test/tools/hugoLockRecords/hugoLockRecords.cpp rename to ndb/test/tools/hugoLockRecords.cpp diff --git a/ndb/test/tools/hugoPkDelete/hugoPkDel.cpp b/ndb/test/tools/hugoPkDelete.cpp similarity index 100% rename from ndb/test/tools/hugoPkDelete/hugoPkDel.cpp rename to ndb/test/tools/hugoPkDelete.cpp diff --git a/ndb/test/tools/hugoPkRead/hugoPkRead.cpp b/ndb/test/tools/hugoPkRead.cpp similarity index 100% rename from ndb/test/tools/hugoPkRead/hugoPkRead.cpp rename to ndb/test/tools/hugoPkRead.cpp diff --git a/ndb/test/tools/hugoPkReadRecord/hugoPkReadRecord.cpp b/ndb/test/tools/hugoPkReadRecord.cpp similarity index 100% rename from ndb/test/tools/hugoPkReadRecord/hugoPkReadRecord.cpp rename to ndb/test/tools/hugoPkReadRecord.cpp diff --git a/ndb/test/tools/hugoPkUpdate/hugoPkUpd.cpp b/ndb/test/tools/hugoPkUpdate.cpp similarity index 100% rename from ndb/test/tools/hugoPkUpdate/hugoPkUpd.cpp rename to ndb/test/tools/hugoPkUpdate.cpp diff --git a/ndb/test/tools/hugoScanRead/hugoScanRead.cpp b/ndb/test/tools/hugoScanRead.cpp similarity index 100% rename from ndb/test/tools/hugoScanRead/hugoScanRead.cpp rename to ndb/test/tools/hugoScanRead.cpp diff --git a/ndb/test/tools/hugoScanUpdate/hugoScanUpd.cpp b/ndb/test/tools/hugoScanUpdate.cpp similarity index 100% rename from ndb/test/tools/hugoScanUpdate/hugoScanUpd.cpp rename to ndb/test/tools/hugoScanUpdate.cpp diff --git a/ndb/test/tools/hugoCalculator/Makefile b/ndb/test/tools/old_dirs/hugoCalculator/Makefile similarity index 100% rename from ndb/test/tools/hugoCalculator/Makefile rename to ndb/test/tools/old_dirs/hugoCalculator/Makefile diff --git a/ndb/test/tools/hugoFill/Makefile b/ndb/test/tools/old_dirs/hugoFill/Makefile similarity index 100% rename from ndb/test/tools/hugoFill/Makefile rename to ndb/test/tools/old_dirs/hugoFill/Makefile diff --git a/ndb/test/tools/hugoLoad/Makefile b/ndb/test/tools/old_dirs/hugoLoad/Makefile similarity index 100% rename from ndb/test/tools/hugoLoad/Makefile rename to ndb/test/tools/old_dirs/hugoLoad/Makefile diff --git a/ndb/test/tools/hugoLockRecords/Makefile b/ndb/test/tools/old_dirs/hugoLockRecords/Makefile similarity index 100% rename from ndb/test/tools/hugoLockRecords/Makefile rename to ndb/test/tools/old_dirs/hugoLockRecords/Makefile diff --git a/ndb/test/tools/hugoPkDelete/Makefile b/ndb/test/tools/old_dirs/hugoPkDelete/Makefile similarity index 100% rename from ndb/test/tools/hugoPkDelete/Makefile rename to ndb/test/tools/old_dirs/hugoPkDelete/Makefile diff --git a/ndb/test/tools/hugoPkRead/Makefile b/ndb/test/tools/old_dirs/hugoPkRead/Makefile similarity index 100% rename from ndb/test/tools/hugoPkRead/Makefile rename to ndb/test/tools/old_dirs/hugoPkRead/Makefile diff --git a/ndb/test/tools/hugoPkReadRecord/Makefile b/ndb/test/tools/old_dirs/hugoPkReadRecord/Makefile similarity index 100% rename from ndb/test/tools/hugoPkReadRecord/Makefile rename to ndb/test/tools/old_dirs/hugoPkReadRecord/Makefile diff --git a/ndb/test/tools/hugoPkUpdate/Makefile b/ndb/test/tools/old_dirs/hugoPkUpdate/Makefile similarity index 100% rename from ndb/test/tools/hugoPkUpdate/Makefile rename to ndb/test/tools/old_dirs/hugoPkUpdate/Makefile diff --git a/ndb/test/tools/hugoScanRead/Makefile b/ndb/test/tools/old_dirs/hugoScanRead/Makefile similarity index 100% rename from ndb/test/tools/hugoScanRead/Makefile rename to ndb/test/tools/old_dirs/hugoScanRead/Makefile diff --git a/ndb/test/tools/hugoScanUpdate/Makefile b/ndb/test/tools/old_dirs/hugoScanUpdate/Makefile similarity index 100% rename from ndb/test/tools/hugoScanUpdate/Makefile rename to ndb/test/tools/old_dirs/hugoScanUpdate/Makefile diff --git a/ndb/test/tools/restart/Makefile b/ndb/test/tools/old_dirs/restart/Makefile similarity index 100% rename from ndb/test/tools/restart/Makefile rename to ndb/test/tools/old_dirs/restart/Makefile diff --git a/ndb/tools/transproxy/Makefile b/ndb/test/tools/old_dirs/transproxy/Makefile similarity index 100% rename from ndb/tools/transproxy/Makefile rename to ndb/test/tools/old_dirs/transproxy/Makefile diff --git a/ndb/tools/verify_index/Makefile b/ndb/test/tools/old_dirs/verify_index/Makefile similarity index 100% rename from ndb/tools/verify_index/Makefile rename to ndb/test/tools/old_dirs/verify_index/Makefile diff --git a/ndb/test/tools/waiter/Makefile b/ndb/test/tools/old_dirs/waiter/Makefile_old similarity index 100% rename from ndb/test/tools/waiter/Makefile rename to ndb/test/tools/old_dirs/waiter/Makefile_old diff --git a/ndb/test/tools/waiter/waiter.cpp b/ndb/test/tools/old_dirs/waiter/waiter.cpp similarity index 100% rename from ndb/test/tools/waiter/waiter.cpp rename to ndb/test/tools/old_dirs/waiter/waiter.cpp diff --git a/ndb/test/tools/restart/restart.cpp b/ndb/test/tools/restart.cpp similarity index 100% rename from ndb/test/tools/restart/restart.cpp rename to ndb/test/tools/restart.cpp diff --git a/ndb/tools/transproxy/transproxy.cpp b/ndb/test/tools/transproxy.cpp similarity index 100% rename from ndb/tools/transproxy/transproxy.cpp rename to ndb/test/tools/transproxy.cpp diff --git a/ndb/tools/verify_index/verify_index.cpp b/ndb/test/tools/verify_index.cpp similarity index 100% rename from ndb/tools/verify_index/verify_index.cpp rename to ndb/test/tools/verify_index.cpp diff --git a/ndb/test/tools/waiter.cpp b/ndb/test/tools/waiter.cpp new file mode 100644 index 00000000000..d57daff3aea --- /dev/null +++ b/ndb/test/tools/waiter.cpp @@ -0,0 +1,56 @@ +/* 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 */ + + +#include "mgmapi.h" +#include +#include +#include +#include +#include + + +#include +#include + +int main(int argc, const char** argv){ + + const char* _hostName = NULL; + int _help = 0; + + struct getargs args[] = { + { "usage", '?', arg_flag, &_help, "Print help", "" } + }; + int num_args = sizeof(args) / sizeof(args[0]); + int optind = 0; + char desc[] = + "hostname:port\n"\ + "This program will connect to the mgmsrv of a NDB cluster.\n"\ + "It will then wait for all nodes to be started\n"; + + if(getarg(args, num_args, argc, argv, &optind) || _help) { + arg_printusage(args, num_args, argv[0], desc); + return NDBT_ProgramExit(NDBT_WRONGARGS); + } + _hostName = argv[optind]; + + NdbRestarter restarter(_hostName); + + if (restarter.waitClusterStarted() != 0) + return NDBT_ProgramExit(NDBT_FAILED); + + return NDBT_ProgramExit(NDBT_OK); +} diff --git a/ndb/tools/Makefile.am b/ndb/tools/Makefile.am new file mode 100644 index 00000000000..46c732c597c --- /dev/null +++ b/ndb/tools/Makefile.am @@ -0,0 +1,16 @@ + +bin_PROGRAMS = drop_tab delete_all desc drop_index list_tables select_all select_count + +delete_all_SOURCES = delete_all.cpp +desc_SOURCES = desc.cpp +drop_index_SOURCES = drop_index.cpp +drop_tab_SOURCES = drop_tab.cpp +list_tables_SOURCES = listTables.cpp +select_all_SOURCES = select_all.cpp +select_count_SOURCES = select_count.cpp + +include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/ndb/tools/Makefile b/ndb/tools/Makefile_old similarity index 100% rename from ndb/tools/Makefile rename to ndb/tools/Makefile_old diff --git a/ndb/tools/delete_all/delete_all.cpp b/ndb/tools/delete_all.cpp similarity index 100% rename from ndb/tools/delete_all/delete_all.cpp rename to ndb/tools/delete_all.cpp diff --git a/ndb/tools/desc/desc.cpp b/ndb/tools/desc.cpp similarity index 100% rename from ndb/tools/desc/desc.cpp rename to ndb/tools/desc.cpp diff --git a/ndb/tools/drop_index/drop_index.cpp b/ndb/tools/drop_index.cpp similarity index 100% rename from ndb/tools/drop_index/drop_index.cpp rename to ndb/tools/drop_index.cpp diff --git a/ndb/tools/drop_tab/drop_tab.cpp b/ndb/tools/drop_tab.cpp similarity index 100% rename from ndb/tools/drop_tab/drop_tab.cpp rename to ndb/tools/drop_tab.cpp diff --git a/ndb/tools/list_tables/listTables.cpp b/ndb/tools/listTables.cpp similarity index 100% rename from ndb/tools/list_tables/listTables.cpp rename to ndb/tools/listTables.cpp diff --git a/ndb/tools/ndbsql/ndbsql.cpp b/ndb/tools/ndbsql.cpp similarity index 100% rename from ndb/tools/ndbsql/ndbsql.cpp rename to ndb/tools/ndbsql.cpp diff --git a/ndb/tools/copy_tab/Makefile b/ndb/tools/old_dirs/copy_tab/Makefile similarity index 100% rename from ndb/tools/copy_tab/Makefile rename to ndb/tools/old_dirs/copy_tab/Makefile diff --git a/ndb/tools/cpcc/Makefile b/ndb/tools/old_dirs/cpcc/Makefile similarity index 100% rename from ndb/tools/cpcc/Makefile rename to ndb/tools/old_dirs/cpcc/Makefile diff --git a/ndb/tools/create_index/Makefile b/ndb/tools/old_dirs/create_index/Makefile similarity index 100% rename from ndb/tools/create_index/Makefile rename to ndb/tools/old_dirs/create_index/Makefile diff --git a/ndb/tools/delete_all/Makefile b/ndb/tools/old_dirs/delete_all/Makefile similarity index 100% rename from ndb/tools/delete_all/Makefile rename to ndb/tools/old_dirs/delete_all/Makefile diff --git a/ndb/tools/desc/Makefile b/ndb/tools/old_dirs/desc/Makefile similarity index 100% rename from ndb/tools/desc/Makefile rename to ndb/tools/old_dirs/desc/Makefile diff --git a/ndb/tools/drop_index/Makefile b/ndb/tools/old_dirs/drop_index/Makefile similarity index 100% rename from ndb/tools/drop_index/Makefile rename to ndb/tools/old_dirs/drop_index/Makefile diff --git a/ndb/tools/drop_tab/Makefile b/ndb/tools/old_dirs/drop_tab/Makefile similarity index 100% rename from ndb/tools/drop_tab/Makefile rename to ndb/tools/old_dirs/drop_tab/Makefile diff --git a/ndb/tools/list_tables/Makefile b/ndb/tools/old_dirs/list_tables/Makefile similarity index 100% rename from ndb/tools/list_tables/Makefile rename to ndb/tools/old_dirs/list_tables/Makefile diff --git a/ndb/tools/ndbnet/Makefile.PL b/ndb/tools/old_dirs/ndbnet/Makefile.PL similarity index 100% rename from ndb/tools/ndbnet/Makefile.PL rename to ndb/tools/old_dirs/ndbnet/Makefile.PL diff --git a/ndb/tools/ndbnet/lib/NDB/Net.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/Base.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/Base.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/Client.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/Client.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/Command.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/Command.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/Config.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/Config.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/Database.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/Database.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/Env.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/Env.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/Node.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/Node.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/NodeApi.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/NodeApi.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/NodeDb.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/NodeDb.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/NodeMgmt.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/NodeMgmt.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/Server.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/Server.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/ServerINET.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/ServerINET.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Net/ServerUNIX.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Net/ServerUNIX.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Run.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Run.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Run.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Run.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Run/Base.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Run/Base.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Run/Database.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Run/Database.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Run/Env.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Run/Env.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Run/Node.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Run/Node.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Util.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Util.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Util.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Util.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Util/Base.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Util/Base.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Util/Dir.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Util/Dir.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Util/Event.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Util/Event.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Util/File.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Util/File.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Util/IO.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Util/IO.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Util/Lock.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Util/Lock.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Util/Log.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Util/Log.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Util/Socket.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Util/Socket.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Util/SocketINET.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Util/SocketINET.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm diff --git a/ndb/tools/ndbnet/lib/NDB/Util/SocketUNIX.pm b/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm similarity index 100% rename from ndb/tools/ndbnet/lib/NDB/Util/SocketUNIX.pm rename to ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm diff --git a/ndb/tools/ndbnet/ndbnet.pl b/ndb/tools/old_dirs/ndbnet/ndbnet.pl similarity index 100% rename from ndb/tools/ndbnet/ndbnet.pl rename to ndb/tools/old_dirs/ndbnet/ndbnet.pl diff --git a/ndb/tools/ndbnet/ndbnetd.pl b/ndb/tools/old_dirs/ndbnet/ndbnetd.pl similarity index 100% rename from ndb/tools/ndbnet/ndbnetd.pl rename to ndb/tools/old_dirs/ndbnet/ndbnetd.pl diff --git a/ndb/tools/ndbnet/ndbrun b/ndb/tools/old_dirs/ndbnet/ndbrun similarity index 100% rename from ndb/tools/ndbnet/ndbrun rename to ndb/tools/old_dirs/ndbnet/ndbrun diff --git a/ndb/tools/ndbsql/Makefile b/ndb/tools/old_dirs/ndbsql/Makefile similarity index 100% rename from ndb/tools/ndbsql/Makefile rename to ndb/tools/old_dirs/ndbsql/Makefile diff --git a/ndb/tools/select_all/Makefile b/ndb/tools/old_dirs/select_all/Makefile similarity index 100% rename from ndb/tools/select_all/Makefile rename to ndb/tools/old_dirs/select_all/Makefile diff --git a/ndb/tools/select_count/Makefile b/ndb/tools/old_dirs/select_count/Makefile similarity index 100% rename from ndb/tools/select_count/Makefile rename to ndb/tools/old_dirs/select_count/Makefile diff --git a/ndb/tools/src/counterviewer/CounterViewer.java b/ndb/tools/old_dirs/src/counterviewer/CounterViewer.java similarity index 100% rename from ndb/tools/src/counterviewer/CounterViewer.java rename to ndb/tools/old_dirs/src/counterviewer/CounterViewer.java diff --git a/ndb/tools/select_all/select_all.cpp b/ndb/tools/select_all.cpp similarity index 100% rename from ndb/tools/select_all/select_all.cpp rename to ndb/tools/select_all.cpp diff --git a/ndb/tools/select_count/select_count.cpp b/ndb/tools/select_count.cpp similarity index 100% rename from ndb/tools/select_count/select_count.cpp rename to ndb/tools/select_count.cpp