BitKeeper/etc/logging_ok:
auto-union
ndb/include/kernel/NodeState.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/include/util/Bitmask.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/kernel/error/ErrorReporter.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CpcClient.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/include/NDBT_Table.hpp:
Auto merged
ndb/test/include/NDBT_Test.hpp:
Auto merged
ndb/test/run-test/main.cpp:
Auto merged
ndb/test/src/HugoOperations.cpp:
Auto merged
ndb/test/src/HugoTransactions.cpp:
Auto merged
ndb/test/src/NDBT_Tables.cpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
ndb/test/src/NdbRestarter.cpp:
Auto merged
ndb/tools/waiter.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
+ added option to ndb_waiter to wait for NO CONTACT
mysql-test/mysql-test-run.sh:
adopting mysql-test-run to new ndb config
mysql-test/ndb/ndbcluster.sh:
adopting mysql-test-run to new ndb config
ndb/tools/waiter.cpp:
added option to wait for NO CONTACT
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Auto merged
ndb/include/ndbapi/NdbApi.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/src/ndbapi/Ndblist.cpp:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/ndbapi/Makefile_old:
Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Made releaseCompletedOpertions private and introduced
NdbConnection::restart instead. This methods basically check a bunch of
status flags before calling releaseCompletedOperations
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Introduced MARKRE_TRACE
Fixed bug on not releasing marker at execABORT
ndb/src/ndbapi/NdbConnection.cpp:
Made releaseCompletedOpertions private and introduced
NdbConnection::restart instead. This methods basically check a bunch of
status flags before calling releaseCompletedOperations
ndb/src/ndbapi/Ndbif.cpp:
Use MARKER_TRACE
ndb/test/src/HugoTransactions.cpp:
Use restart instead of releaseCompletedOperations
ndb/test/src/UtilTransactions.cpp:
Use restart instead of releaseCompletedOperations
ndb/tools/delete_all.cpp:
Use restart instead of releaseCompletedOperations
BitKeeper/deleted/.del-Epilogue.mk~60f7edf886726154:
Auto merged
BitKeeper/deleted/.del-Makefile_old~1f37e763ba5d06d0:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
ndb/src/kernel/Main.cpp:
Auto merged
ndb/include/ndbapi/Ndb.hpp:
Auto merged
ndb/include/ndbapi/NdbApi.hpp:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/Makefile_old:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationScan.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationSearch.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/src/ndbapi/Ndblist.cpp:
Auto merged
ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp:
Auto merged
ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp:
Auto merged
ndb/src/old_files/client/odbc/common/DataType.cpp:
Auto merged
ndb/src/old_files/client/odbc/common/DataType.hpp:
Auto merged
ndb/test/ndbapi/Makefile_old:
Auto merged
ndb/tools/ndbsql.cpp:
Auto merged
BitKeeper/deleted/.del-stop_ndbcluster.sh~b3b9e9505384aca1:
Delete: mysql-test/ndb/stop_ndbcluster.sh
mysql-test/mysql-test-run.sh:
collapsed ndb start/stop scripts
mysql-test/ndb/Makefile.am:
collapsed ndb start/stop scripts
mysql-test/ndb/ndbcluster.sh:
collapsed ndb start/stop scripts + ndb bin name changes
ndb/src/kernel/Makefile.am:
ndb bin name changes
ndb/src/kernel/blocks/backup/restore/Makefile.am:
ndb bin name changes
ndb/src/mgmclient/Makefile.am:
ndb bin name changes
ndb/src/mgmsrv/Makefile.am:
ndb bin name changes
ndb/tools/Makefile.am:
ndb bin name changes
BitKeeper/deleted/.del-Makefile.am~d4e228ebd21fc066:
Delete: ndb/include/Makefile.am
acinclude.m4:
static linking of ndbclient into mysqld
configure.in:
removed ndb/include/Makefile.am + fixed conditional compile of ndb shm, sci
ndb/Makefile.am:
dist-hook for make distdir in ndb
ndb/config/type_ndbapitest.mk.am:
use of libndbclient.so in testprograms
ndb/config/type_ndbapitools.mk.am:
static linking to binary distributed ndb tools
ndb/src/Makefile.am:
enable libndbclient.so
ndb/src/common/transporter/Makefile.am:
added support for optional inclusion of shared mem and sci in ndb transporter
ndb/tools/Makefile.am:
new type for tools which should be statically linked with libndbclient
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
into mysql.com:/home/jonas/src/wl1671
ndb/include/ndbapi/Ndb.hpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/include/ndbapi/Ndb.hpp:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbIndexOperation.hpp:
Auto merged
ndb/Epilogue.mk_old:
Auto merged
ndb/src/common/debugger/signaldata/Makefile_old:
Auto merged
ndb/src/common/mgmcommon/Makefile_old:
Auto merged
ndb/src/common/util/Makefile_old:
Auto merged
ndb/src/kernel/Makefile_old:
Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
Auto merged
ndb/src/kernel/ndb-main/Makefile_old:
Auto merged
ndb/src/kernel/vm/Makefile_old:
Auto merged
ndb/src/mgmapi/Makefile_old:
Auto merged
ndb/src/mgmclient/Makefile_old:
Auto merged
ndb/src/mgmsrv/Makefile_old:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
ndb/src/ndbapi/Makefile_old:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbApiSignal.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationInt.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/test/ndbapi/Makefile_old:
Auto merged
ndb/test/ndbapi/ScanFunctions.hpp:
Auto merged
ndb/test/ndbapi/ScanInterpretTest.hpp:
Auto merged
ndb/test/ndbapi/testDataBuffers.cpp:
Auto merged
ndb/test/ndbapi/old_dirs/testBackup/Makefile:
Auto merged
ndb/test/ndbapi/old_dirs/testGrep/Makefile:
Auto merged
ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile:
Auto merged
ndb/test/ndbapi/testDict.cpp:
Auto merged
ndb/test/ndbapi/testGrep.cpp:
Auto merged
ndb/test/ndbapi/testIndex.cpp:
Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
ndb/test/ndbapi/testSystemRestart.cpp:
Auto merged
ndb/test/ndbapi/testTimeout.cpp:
Auto merged
ndb/test/src/Makefile_old:
Auto merged
ndb/test/src/UtilTransactions.cpp:
Auto merged
ndb/test/tools/create_index.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
into mc05.(none):/space2/tomas/mysql-4.1
ndb/include/ndbapi/Ndb.hpp:
Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
Auto merged
ndb/src/kernel/blocks/backup/restore/main.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/ndbapi/testGrepVerify.cpp:
Auto merged
ndb/tools/listTables.cpp:
Auto merged
ndb/tools/waiter.cpp:
Rename: ndb/test/tools/waiter.cpp -> ndb/tools/waiter.cpp
configure.in:
added install dirs for ndb
ndb/Makefile.am:
ndb headers for install
ndb/config/common.mk.am:
DEFS_LOC in ndb make
ndb/config/type_ndbapi.mk.am:
added LDADD=libNDB_API.la default for type_ndbapi
ndb/src/cw/cpcd/Makefile.am:
changes install dir
ndb/src/kernel/blocks/backup/restore/Makefile.am:
changes install dir
ndb/src/kernel/ndb-main/Makefile.am:
changes install dir
ndb/src/mgmapi/Makefile.am:
changes install dir
ndb/src/mgmclient/Makefile.am:
changes install dir
ndb/src/mgmsrv/Makefile.am:
changes install dir
ndb/src/ndbapi/Makefile.am:
changes install dir
ndb/test/ndbapi/Makefile.am:
changes install dir
ndb/test/ndbapi/bank/Makefile.am:
changes install dir
ndb/test/tools/Makefile.am:
changes install dir
mysql-test/ndb/install_ndbcluster.sh:
new
mysql-test/ndb/stop_ndbcluster.sh:
new
ndb/tools/Makefile.am:
changes install dir
into poseidon.(none):/home/tomas/mysql-4.1-ndb-make
configure.in:
Auto merged
ndb/src/Makefile_old:
Auto merged
ndb/test/ndbapi/acid.cpp:
Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
Auto merged
ndb/test/ndbapi/flexHammer.cpp:
Auto merged
ndb/test/ndbapi/flexTT.cpp:
Auto merged
ndb/test/ndbapi/initronja.cpp:
Auto merged
ndb/test/ndbapi/interpreterInTup.cpp:
Auto merged
ndb/test/ndbapi/msa.cpp:
Auto merged
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp:
Auto merged
ndb/test/ndbapi/testDataBuffers.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
ndb/test/ndbapi/testRestartGci.cpp:
Auto merged
ndb/test/ndbapi/testScan.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
ndb/test/ndbapi/flexScan.cpp:
Auto merged
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
configure.in:
Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
Moved NdbSchemaCon and NdbSchemaOp out of the public NdbApi, it can however still be used by old test programs.
Added print oof indexes to desc.
ndb/BinDist.sh:
Removed AttrType.hpp from BinDist.sh
ndb/include/ndbapi/Ndb.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
ndb/include/ndbapi/NdbApi.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
ndb/include/ndbapi/NdbConnection.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
Moved internal types to the class where they are used
ndb/include/ndbapi/NdbIndexOperation.hpp:
Use limit from ndbapi_limit.h
ndb/include/ndbapi/NdbOperation.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
Remove faulty comment about how many attributes a key is allowed to consist of
Removed unused member variables
ndb/include/ndbapi/NdbRecAttr.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
ndb/include/ndbapi/NdbSchemaCon.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
ndb/include/ndbapi/NdbSchemaOp.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
Moved all "old" datatypes here, so if a test program is still using old type, include NdbSchemaCon.hpp
ndb/include/ndbapi/ndbapi_limits.h:
Corrected limitations, added some from AttrTyp.hpp
ndb/src/Makefile:
Remove newtonapi from Makefile
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
Removed AttrType
Include NdbSchemaCon since restore uses old types
ndb/src/kernel/blocks/backup/restore/main.cpp:
Include NdbOut
ndb/src/mgmsrv/MgmtSrvr.cpp:
Remov AttrType.hpp
ndb/src/ndbapi/ClusterMgr.cpp:
Remov AttrType.hpp
ndb/src/ndbapi/Ndb.cpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
Moved internal types to the class where they are used
ndb/src/ndbapi/NdbApiSignal.cpp:
Removed AttrType.hpp
ndb/src/ndbapi/NdbApiSignal.hpp:
Removed AttrType.hpp
ndb/src/ndbapi/NdbConnection.cpp:
Moved internal type s to the class where they belong
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
RemovedAttrType.hpp
Use limits from ndbapi_limits.h
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Removed AttrType.hpp
Moved printRecAttr to end since it depends on old types and need to include "NdbSchemaCon", function will be rewritten and moved to NdbRecAttr. It's also useful from other places where an attribute has been read into an NdbRecAttr.
ndb/src/ndbapi/NdbIndexOperation.cpp:
Use limitations from ndbapi_limits.h
Moved internal tyeps to the class where they belongs
ndb/src/ndbapi/NdbOperation.cpp:
Use limits from ndbapi_limits.h
ndb/src/ndbapi/NdbOperationDefine.cpp:
Remove AttrType.hpp
ndb/src/ndbapi/NdbOperationExec.cpp:
Moved internal tyeps to the class where they belongs
ndb/src/ndbapi/NdbOperationInt.cpp:
RemovedAttrType.hpp
Use limits from ndbapi_limits.h
ndb/src/ndbapi/NdbOperationScan.cpp:
RemovedAttrType.hpp
Use limits from ndbapi_limits.h
ndb/src/ndbapi/NdbOperationSearch.cpp:
Removed AttrType.hpp
Use limits from ndbapi_limits.h
ndb/src/ndbapi/NdbResultSet.cpp:
Moved the "internal" types to corresponding class
ndb/src/ndbapi/NdbSchemaCon.cpp:
Updated not to be included in public NdbApi
ndb/src/ndbapi/NdbSchemaOp.cpp:
Updated not to be included in public NdbApi
ndb/src/ndbapi/NdbUtil.hpp:
Removed AttrType.hpp
ndb/src/ndbapi/Ndbif.cpp:
Removed AttrType.hpp
Removed NdbSchemaCon and NdbSchemaOp from public NdbApi
Moved "interal" types to their corresponding class
ndb/src/ndbapi/Ndbinit.cpp:
Removed NdbSchemaCon and NdbSchemaOp from public NdbApi
ndb/src/ndbapi/Ndblist.cpp:
Removed NdbSchemaCon and NdbSchemaOp from public NdbApi
Moved "internal" types to their corresponding class
ndb/src/ndbapi/TransporterFacade.cpp:
Removed AttrType.hpp
ndb/src/ndbapi/TransporterFacade.hpp:
Removed AttrType.hpp
Moved internal definition of how many Ndb objects to create to here
ndb/test/include/NDBT_Table.hpp:
Removed old NdbSchema*
Added function to print information about an index
ndb/test/ndbapi/acid/acid.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/flexAsynch/flexAsynch.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/flexScan/flexScan.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/interpreterInTup/interpreterInTup.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/lmc-bench/src/user/userInterface.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/ronja/initronja/initronja.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/telco/msa.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/testDataBuffers/testDataBuffers.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/testNdbApi/testNdbApi.cpp:
Remove AttrType.hpp
Define max number of Ndb objects test should "try" to create.
ndb/test/ndbapi/testRestartGci/testRestartGci.cpp:
Moved "internal" datatypes to corresponding class, in this case Ndb class
ndb/test/src/NDBT_ResultRow.cpp:
This test program uses old NdbScheaCon.hpp
But should soon use "printer" from NdbRecAttr
ndb/test/src/NDBT_Table.cpp:
Print table info more SQL like
ndb/test/src/UtilTransactions.cpp:
When AttrType.hpp, this hidden bug was discovered. Using wrong enum types in switch.
ndb/tools/desc/desc.cpp:
Alos print info about indexes for a table
BitKeeper/deleted/.del-init_rm.c~47230fcd35059112:
Delete: ndb/tools/init_rm/init_rm.c
ndb/examples/Makefile:
Add target for clean_dep
ndb/src/Makefile:
Remove env dir
ndb/test/ndbapi/Makefile:
Remove some old stuff
ndb/test/ndbapi/flexAsynch/Makefile:
Cleanup
ndb/test/ndbapi/flexBench/Makefile:
Cleanup
ndb/test/ndbapi/flexTT/Makefile:
Cleanup
ndb/test/odbc/Makefile:
Don't compile test dm-unixodb for now
ndb/tools/Makefile:
Remove init_rm tool
