BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/sql_show.cc:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
debug printouts
mysql-test/ndb/ndbcluster.sh:
.
ndb/include/mgmcommon/ConfigRetriever.hpp:
added printout for where configuration is fetched
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
added printout for where configuration is fetched
ndb/src/kernel/main.cpp:
added printout for where configuration is fetched
ndb/src/kernel/vm/Configuration.cpp:
added printout for where configuration is fetched
ndb/src/kernel/vm/Configuration.hpp:
added printout for where configuration is fetched
ndb/src/ndbapi/Ndb.cpp:
debug printouts
BitKeeper/deleted/.del-NdbScanReceiver.hpp~5c295814a47e7bb4:
Delete: ndb/src/ndbapi/NdbScanReceiver.hpp
BitKeeper/deleted/.del-NdbScanReceiver.cpp~b8a7472e4a7c424f:
Delete: ndb/src/ndbapi/NdbScanReceiver.cpp
ndb/include/ndb_global.h:
Added ndb_end (corresponding to ndb_init)
ndb/src/common/util/ndb_init.c:
Added ndb_end (corresponding to ndb_init)
ndb/src/ndbapi/NdbScanOperation.cpp:
Release SCAN_TABREQ and
make sure to call NdbOperation::release (that releases other stuff)
ndb/src/ndbapi/Ndbinit.cpp:
Reorder free-ing so that signal are release last
(so that operations holding signals can release the first)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
acinclude.m4:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
oops
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
jamEntry
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
jamEntry
mysql-test/r/ndb_index.result:
ndb charsets: minimal fix to make test pass
mysql-test/t/ndb_index.test:
ndb charsets: minimal fix to make test pass
using tryBind instead to determine if we're "config host" is "local"
ndb/include/util/SocketServer.hpp:
made tryBind static
ndb/src/common/util/SocketServer.cpp:
made tryBind static
ndb/src/mgmsrv/MgmtSrvr.cpp:
using tryBind instead to determine if we're "config host" is "local"
Removed grep introduced bogus mgm call
BitKeeper/deleted/.del-LogLevel.cpp~314a6bada2df40a8:
Delete: ndb/src/common/debugger/LogLevel.cpp
ndb/include/debugger/EventLogger.hpp:
Removed match functionality and put into mgmapi
ndb/include/kernel/LogLevel.hpp:
Update LogLevel
ndb/include/mgmapi/mgmapi_config_parameters.h:
fix parameter
ndb/src/common/debugger/EventLogger.cpp:
Removed match functionality and put into mgmapi
ndb/src/common/debugger/Makefile.am:
removed LogLevel.cpp
ndb/src/cw/cpcd/APIService.cpp:
compiler warning
ndb/src/cw/cpcd/CPCD.cpp:
compiler warning
ndb/src/cw/cpcd/CPCD.hpp:
compiler warning
ndb/src/cw/cpcd/main.cpp:
compiler warning
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Changed name of config parameter
ndb/src/kernel/vm/Configuration.cpp:
Changed name of config parameter
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
added support for setting up multiple interfaces
correct connect address for mgmt server
bug, -l flag would be interpreted as connectstring
added flag to remove all node id checks
changed automatic allocation of ports somewhat
ndb/include/mgmapi/mgmapi_config_parameters.h:
removed different CFG_ defined for connection host names
ndb/include/transporter/TransporterRegistry.hpp:
added support for setting up multiple interfaces
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
removed different CFG_ defined for connection host names
ndb/src/common/mgmcommon/IPCConfig.cpp:
added support for setting up multiple interfaces
ndb/src/common/portlib/NdbTCP.cpp:
added debug printouts
ndb/src/common/transporter/TransporterRegistry.cpp:
added support for setting up multiple interfaces
ndb/src/common/util/SocketServer.cpp:
added my_thread init to enable debug printouts
ndb/src/mgmclient/CommandInterpreter.cpp:
shortened lines
ndb/src/mgmsrv/ConfigInfo.cpp:
removed different CFG_ defined for connection host names
changed automatic allocation of ports somewhat
ndb/src/mgmsrv/MgmtSrvr.cpp:
correct connect address for mgmt server
ndb/src/mgmsrv/Services.cpp:
shoretened lines
ndb/src/mgmsrv/main.cpp:
bug, -l flag would be interpreted as connectstring
added flag to remove all node id checks
Add support for getting events via mgmapi
removed all traces of stat port
BitKeeper/deleted/.del-NodeLogLevel.cpp~324045b93af7123b:
Delete: ndb/src/mgmsrv/NodeLogLevel.cpp
BitKeeper/deleted/.del-NodeLogLevel.hpp~4f4ab0fe52fb497c:
Delete: ndb/src/mgmsrv/NodeLogLevel.hpp
BitKeeper/deleted/.del-NodeLogLevelList.cpp~97dc9c909e3e92bf:
Delete: ndb/src/mgmsrv/NodeLogLevelList.cpp
BitKeeper/deleted/.del-NodeLogLevelList.hpp~ef567dd850abddc7:
Delete: ndb/src/mgmsrv/NodeLogLevelList.hpp
ndb/include/debugger/EventLogger.hpp:
Split EventLogger into two classes
ndb/include/kernel/LogLevel.hpp:
Add some nice to have methods + use uint8 for storage
ndb/include/kernel/signaldata/EventSubscribeReq.hpp:
operator=
ndb/include/kernel/signaldata/SetLogLevelOrd.hpp:
operator=
ndb/include/mgmapi/mgmapi.h:
remove deprecated vars
ndb/src/common/debugger/EventLogger.cpp:
Split into 2
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Remove hardcoded mgm stuff
ndb/src/mgmsrv/CommandInterpreter.cpp:
#if 0
some deprecated code
ndb/src/mgmsrv/Makefile.am:
remove NodeLogLevel*
ndb/src/mgmsrv/MgmtSrvr.cpp:
Remove dead code
Handle multiple event listeners in mgmapi
ndb/src/mgmsrv/MgmtSrvr.hpp:
Remove dead code
Handle multiple event listeners in mgmapi
ndb/src/mgmsrv/Services.cpp:
listen event method in mgmapi
ndb/src/mgmsrv/Services.hpp:
listen event method in mgmapi
ndb/src/mgmsrv/main.cpp:
remove stat port
into mc04.(none):/space/mysql/mysql-4.1-ndb
acinclude.m4:
Auto merged
configure.in:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/Makefile.am:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Logging to logging@openlogging.org accepted
SCI_Transporter.hpp, SCI_Transporter.cpp:
Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
TransporterRegistry.cpp:
Some fixes for wrap around needed plus DBUG handling
TCP_Transporter.hpp, TCP_Transporter.cpp:
Added DBUG statements
SHM_Transporter.hpp, SHM_Transporter.cpp:
Fixed SHM Transporter
SHM_Buffer.hpp:
Fixed SHM Buffer to handle wrap around properly
IPCConfig.cpp:
Fixed up config of SCI
SocketServer.cpp:
Added DBUG support for SocketServer threads
ConfigInfo.cpp:
Config changes for SCI
TransporterDefinitions.hpp, mgmapi_config_parameters.h:
SCI fixes
Makefile.am, type_ndbapitools.mk.am, type_ndbapitest.mk.am:
Added SCI library path to Makefiles
configure.in:
Fixed small bug with shared mem and sci together in configure
acinclude.m4:
Added possibility of providing SCI library path in confgure
acinclude.m4:
Added possibility of providing SCI library path in confgure
configure.in:
Fixed small bug with shared mem and sci together in configure
ndb/config/type_ndbapitest.mk.am:
Added SCI library path to Makefiles
ndb/config/type_ndbapitools.mk.am:
Added SCI library path to Makefiles
ndb/src/cw/cpcd/Makefile.am:
Added SCI library path to Makefiles
ndb/src/kernel/Makefile.am:
Added SCI library path to Makefiles
ndb/src/kernel/blocks/backup/restore/Makefile.am:
Added SCI library path to Makefiles
ndb/src/mgmsrv/Makefile.am:
Added SCI library path to Makefiles
sql/Makefile.am:
Added SCI library path to Makefiles
ndb/src/common/transporter/Makefile.am:
Added SCI library path to Makefiles
ndb/include/mgmapi/mgmapi_config_parameters.h:
SCI fixes
ndb/include/transporter/TransporterDefinitions.hpp:
SCI fixes
ndb/src/mgmsrv/ConfigInfo.cpp:
Config changes for SCI
ndb/src/common/util/SocketServer.cpp:
Added DBUG support for SocketServer threads
ndb/src/common/mgmcommon/IPCConfig.cpp:
Fixed up config of SCI
ndb/src/common/transporter/SHM_Buffer.hpp:
Fixed SHM Buffer to handle wrap around properly
ndb/src/common/transporter/SHM_Transporter.cpp:
Fixed SHM Transporter
ndb/src/common/transporter/SHM_Transporter.hpp:
Fixed SHM Transporter
ndb/src/common/transporter/TCP_Transporter.cpp:
Added DBUG statements
ndb/src/common/transporter/TCP_Transporter.hpp:
Added DBUG statements
ndb/src/common/transporter/TransporterRegistry.cpp:
Some fixes for wrap around needed plus DBUG handling
ndb/src/common/transporter/SCI_Transporter.cpp:
Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
ndb/src/common/transporter/SCI_Transporter.hpp:
Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
clearer configure description texts
changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects
moved allocation/deletion of Ndb objects to Thd_ndb
ndb/include/ndbapi/NdbDictionary.hpp:
new method to set size of local table data
ndb/src/mgmsrv/ConfigInfo.cpp:
clearer configure description texts
ndb/src/ndbapi/DictCache.cpp:
changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
ndb/src/ndbapi/DictCache.hpp:
changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
ndb/src/ndbapi/NdbDictionary.cpp:
new method to set size of local table data
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
new method to set size of local table data
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
new method to set size of local table data
sql/ha_ndbcluster.cc:
new method to set size of local table data
moved allocation/deletion of Ndb objects to Thd_ndb
sql/ha_ndbcluster.h:
move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects
new methods to keep "records" up to date
unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
new methods to keep "records" up to datecorrect record field in ndbcluster handler
new method for ndbcluster handler to store/retrieve table and thread specific data
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
hanged deleteKey to return ponter to deleted object
moved heavy global cache fetch from inline to separate method
mysql-test/r/ndb_alter_table.result:
correct record field in ndbcluster handler
mysql-test/r/ndb_blob.result:
correct record field in ndbcluster handler
ndb/include/ndbapi/NdbDictionary.hpp:
new method for ndbcluster handler to store/retrieve table and thread specific data
ndb/src/ndbapi/DictCache.cpp:
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
ndb/src/ndbapi/DictCache.hpp:
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
ndb/src/ndbapi/Ndb.cpp:
replaced method DictionaryImpl::getTable with DictionaryImpl::get_local_table_info
ndb/src/ndbapi/NdbDictionary.cpp:
new method for ndbcluster handler to store/retrieve table and thread specific data
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
moved heavy global cache fetch from inline to separate method
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
replaced method DictionaryImpl::getTable with DictionaryImpl::get_local_table_info
ndb/src/ndbapi/NdbLinHash.hpp:
changed deleteKey to return ponter to deleted object
sql/ha_ndbcluster.cc:
moved all ndb thread specific data into new placeholder
new methods to keep "records" up to date
unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
sql/ha_ndbcluster.h:
new methods to keep "records" up to date
sql/sql_class.h:
moved all ndb thread specific data into new placeholder
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/ha_ndbcluster.cc:
Go with the new solution
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/mgmcommon/LocalConfig.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/Ndbif.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
fixed some mutex locks for Ndb objects
moved TranspoterFacade::stop_instance to cluster connection
moved Socket Server::start_server outside the TransporterFacade::start_instance thread
ndb/include/mgmapi/mgmapi.h:
improved show command
ndb/src/mgmapi/mgmapi.cpp:
improved show command
ndb/src/mgmclient/CommandInterpreter.cpp:
improved show command
ndb/src/mgmsrv/MgmtSrvr.cpp:
improved show command
ndb/src/mgmsrv/MgmtSrvr.hpp:
improved show command
ndb/src/mgmsrv/Services.cpp:
improved show command
ndb/src/ndbapi/Ndbinit.cpp:
fixed some mutex locks for Ndb objects
moved TranspoterFacade::stop_instance to cluster connection
ndb/src/ndbapi/TransporterFacade.cpp:
movet Socket Server::start_server outside the TransporterFacade::start_instance thread
ndb/src/ndbapi/TransporterFacade.hpp:
movet Socket Server::start_server outside the TransporterFacade::start_instance thread
ndb/src/ndbapi/ndb_cluster_connection.cpp:
movet Socket Server::start_server outside the TransporterFacade::start_instance thread
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
added sanity checks for config file
changed so that ndb_0 is replaced by ndb_pid#### in ndb files
added error_string for to some functions, alloc_node_id(), start()
added better error printout for failed alloc node id
better error printouts for failures when starting ndb_mgmd
ndb/include/mgmapi/mgmapi.h:
added method to retrieve mysqld, ndbd, and ndb_mgmd aliases for API,MGM and DB
ndb/src/common/mgmcommon/ConfigInfo.cpp:
added sanity checks for config file
ndb/src/common/mgmcommon/NdbConfig.c:
changed so that ndb_0 is replaced by ndb_pid#### in ndb files
ndb/src/kernel/error/ErrorReporter.cpp:
removed usage of tracefile early in startup (when it's normally filled with zeroes)
ndb/src/mgmapi/mgmapi.cpp:
added method to retrieve mysqld, ndbd, and ndb_mgmd aliases for API,MGM and DB
ndb/src/mgmsrv/MgmtSrvr.cpp:
added error_string for to some functions, alloc_node_id(), start()
ndb/src/mgmsrv/MgmtSrvr.hpp:
added error_string for to some functions, alloc_node_id(), start()
ndb/src/mgmsrv/Services.cpp:
added better error printout for failed alloc node id
ndb/src/mgmsrv/main.cpp:
better error printouts for failures when starting ndb_mgmd
Use const table * in NDB API
ndb/include/ndbapi/Ndb.hpp:
Removed useFullyQualifiedNames(bool)
Changed so that auto increment methods takes const pointer
ndb/include/ndbapi/NdbBlob.hpp:
Changed to const table pointer
ndb/include/ndbapi/NdbConnection.hpp:
Changed to const table pointer
ndb/include/ndbapi/NdbIndexOperation.hpp:
Changed to const table pointer
ndb/include/ndbapi/NdbOperation.hpp:
Changed to const table pointer
ndb/include/ndbapi/NdbScanOperation.hpp:
Changed to const table pointer
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
Corrected size & array size in case of blob usage
ndb/src/kernel/blocks/backup/restore/consumer_restore.cpp:
Removed use fully qualified name
Handle blob tables
ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp:
Introduced mapping between old/new table (wrt ids)
ndb/src/kernel/blocks/backup/restore/main.cpp:
removed extra Uint32
ndb/src/ndbapi/Ndb.cpp:
Changed to const table pointer
ndb/src/ndbapi/NdbConnection.cpp:
Changed to const table pointer
ndb/src/ndbapi/NdbIndexOperation.cpp:
Changed to const table pointer
ndb/src/ndbapi/NdbOperation.cpp:
Changed to const table pointer
ndb/src/ndbapi/NdbScanOperation.cpp:
Changed to const table pointer
sql/ha_ndbcluster.cc:
Changed to const table pointer
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbReceiver.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
SCCS merged
some other small fixes
ndb/include/mgmcommon/ConfigRetriever.hpp:
added options to do_connect to contol how connects failures should be treated
ndb/include/mgmcommon/NdbConfig.h:
method to retrieve datadir path (to user for chdir)
ndb/include/ndbapi/ndb_cluster_connection.hpp:
Added connect thread
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
added options to do_connect to contol how connects failures should be treated
ndb/src/common/mgmcommon/NdbConfig.c:
method to retrieve datadir path (to user for chdir)
ndb/src/kernel/main.cpp:
ndbd to do chdir
ndb/src/kernel/vm/WatchDog.cpp:
added my_thread_init for debug
ndb/src/ndbapi/ClusterMgr.cpp:
added my_thread_init for debug
ndb/src/ndbapi/TransporterFacade.cpp:
removed call to atexit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
added connect thread
into mysql.com:/space/pekka/ndb/version/my41-tux
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
