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
Still known bugs :-(
ndb/include/kernel/signaldata/ScanTab.hpp:
Add close flag
ndb/include/ndbapi/NdbConnection.hpp:
Moved mehtod outside
ndb/include/ndbapi/NdbScanOperation.hpp:
Removed err code from
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Updated printer
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
New error inserts for SCAN
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Update handling of frag timeouts
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Update handling of frag timeouts
ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
Don't send empty TRANSID_AI's
ndb/src/ndbapi/NdbConnectionScan.cpp:
Update error handling of scan
ndb/src/ndbapi/NdbScanOperation.cpp:
Update error handling of scan
ndb/src/ndbapi/Ndbif.cpp:
Update error handling of scan
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
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
configure.in:
Auto merged
ndb/src/mgmapi/Makefile.am:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
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 mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
ndb/src/kernel/blocks/dblqh/Dblqh.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/blocks/dblqh/DblqhMain.cpp:
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/Ndbif.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/testDict.cpp:
Auto merged
ndb/test/ndbapi/testSystemRestart.cpp:
Auto merged
ndb/test/ndbapi/testTimeout.cpp:
Auto merged
ndb/test/src/Makefile_old:
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
into mysql.com:/home/jonas/src/mysql-4.1-ndb
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.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
WL#1747 and #1746 allow user to decide if ordered index should be created or not
BitKeeper/deleted/.del-AttrType.hpp~a9b2d6efcf660378:
Delete: ndb/include/ndbapi/AttrType.hpp
sql/ha_ndbcluster.cc:
Removed the NDB_ERR_CODE_OFFSET, ndb and handler error codes should not clash
Encapsulated functionality to cache information about known indexes into buil_index_list
Added detection of algorithm from key_info in function get_index_type_from_table
Updated read_range_first and records_in_range to work wih new prototype.
sql/ha_ndbcluster.h:
WL#1746 and WL#1747 Added ability to skip creating an ordered index in addition to the hash index if the user so wishes.
Modified get_error_message to return error messaga in a String datatype, in that way the String class will take care of wheter the "data" has to be freed or not.
sql/handler.cc:
Use String datatype as ouput parameter of get_error_message.
sql/handler.h:
Changed the function prototype for getting error messages from handler to use String datataype
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/ha_ndbcluster.h:
SCCS merged
into neptunus.(none):/home/magnus/mysql-4.1
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/deleted/.del-regression.sh~c19f771726612629:
Auto merged
extra/perror.c:
Auto merged
ndb/include/debugger/SignalLoggerManager.hpp:
Auto merged
ndb/include/ndb_version.h:
Auto merged
ndb/src/common/portlib/unix/NdbMem.c:
Auto merged
ndb/src/common/portlib/unix/NdbThread.c:
Auto merged
ndb/src/common/util/Parser.cpp:
Auto merged
ndb/src/common/util/getarg.c:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
Auto merged
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
Auto merged
ndb/src/mgmapi/test/keso.c:
Auto merged
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
included full my_global.h and resolved some resulting name conflicts
ndb/include/ndb_global.h:
included full my_global.h and resolved some resulting name conflicts
ndb/include/logger/FileLogHandler.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/include/util/File.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/common/logger/FileLogHandler.cpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/common/util/File.cpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/common/util/strlcat.c:
included full my_global.h and resolved some resulting name conflicts
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/rep/RepComponents.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/rep/rep_version.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/rep/storage/GCIContainer.hpp:
included full my_global.h and resolved some resulting name conflicts
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb_global.h:
new file
ndb/Defs.mk:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/Epilogue.mk:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/include/util/NdbString.h:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/getarg.c:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/strdup.c:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/strlcat.c:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/strlcpy.c:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/include/ndbapi/ndbapi_limits.h:
Removed define for NDB_MAX_CONNECTIONS, wrong value+it's not needed to be defined here. User will get error if creating too many Ndb objects.
