ndb/src/mgmsrv/CommandInterpreter.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
removed methods that are duplicated in management client
ndb/src/mgmsrv/CommandInterpreter.cpp:
removed methods that are duplicated in management client
ndb/src/mgmsrv/CommandInterpreter.hpp:
removed methods that are duplicated in management client
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/kernel/LogLevel.hpp:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/tools/Makefile.am:
Auto merged
ndb/tools/restore/consumer_restore.cpp:
1) Fix bug when blobs and multiple databases bug#7379
2) Fix bug #7346
ndb/tools/restore/consumer_restore.hpp:
Moved tuple handle into callback object
instead of having separate array
Declared m_transactions volatile
removed theCurrentConnectCounter
optimized the_release_ind by using pos[0] to indicate that there is something there
smaller storage of theDBNodes array by using Uint8
set the_relase_ind array to Uint32 to avoid possible parallell thread usage errors
ndb/test/ndbapi/testDeadlock.cpp:
for broken compilers
sql/ha_ndbcluster.cc:
Use DBUG_PRINT since DBUG_FILE cannot be filtered out
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
missing DBUG_RETURN
ndb/include/kernel/signaldata/TupFrag.hpp:
fix some error codes
ndb/include/kernel/signaldata/TuxMaint.hpp:
fix some error codes
ndb/include/ndbapi/NdbBlob.hpp:
fix some error codes
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
fix some error codes
ndb/src/ndbapi/ndberror.c:
fix some error codes
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/Makefile.am:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/tools/Makefile.am:
Auto merged
ndb/tools/Makefile.am:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
ndb/include/kernel/AttributeDescriptor.hpp:
removed unused
ndb/include/kernel/ndb_limits.h:
removed unused
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Differentiate between nullable columns and null fields
TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Differentiate between nullable columns and null fields
TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Handle distribution key and collation in same subroutine
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Handle distribution key and collation in same subroutine
ndb/src/kernel/vm/VMSignal.hpp:
Increase size of signal->theData to 32k
ndb/test/ndbapi/testPartitioning.cpp:
better usage
include/raid.h:
Fixing compile-time warning: pragma interface is not supported in C,
let's move it to C++ part of the header.
ndb/include/kernel/signaldata/CreateEvnt.hpp:
- remove extra erroneous ; from ends of function definitions
ndb/include/kernel/signaldata/PackedSignal.hpp:
- remove extra erroneous ; from ends of function definitions
ndb/include/kernel/signaldata/SumaImpl.hpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/common/debugger/signaldata/NFCompleteRep.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/common/logger/FileLogHandler.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/backup/BackupInit.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/grep/GrepInit.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/ndbfs/VoidFs.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/suma/Suma.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/suma/SumaInit.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/kernel/blocks/trix/Trix.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/mgmsrv/MgmtSrvr.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/ndbapi/NdbEventOperation.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/src/ndbapi/NdbScanFilter.cpp:
- remove extra erroneous ; from ends of function definitions
ndb/tools/restore/Restore.cpp:
- remove extra erroneous ; from ends of function definitions
sql/item_create.h:
- remove extra erroneous ;
sql/sql_cache.cc:
- remove extra erroneous ;
tests/client_test.c:
- fix -pedantic warning
ndb_mgm_set_int_parameter
ndb_mgm_set_int64_parameter
ndb_mgm_set_string_parameter
ndb/src/mgmapi/mgmapi.cpp:
Don't include a ': ' at the end of an args.put() name.
It is likely that the following calls don't work before this checkin:
ndb_mgm_set_int_parameter
ndb_mgm_set_int64_parameter
ndb_mgm_set_string_parameter
luckily nobody was actually calling these.
ndb/test/ndbapi/testPartitioning.cpp:
Update test partitioning to add primary keys (distribution keys)
incase of either
- only 1 primary key
- primary keys with charsets
ndb/test/src/HugoCalculator.cpp:
Fix so that Hugo can cope with pk's in the "end" of the table
Dynamic port allocation of cluster nodes:
Impl 1 is reporting the port used back to the mgmd. No actual dynamic ports.
ndb/src/common/mgmcommon/IPCConfig.cpp:
pass correct node id to add_transporter_interface.
remoteNodeId is what we want, and is what we're now passing
ndb/src/mgmapi/mgmapi.cpp:
Don't use a ': ' at the end of args.put calls.
ndb/src/mgmsrv/Services.cpp:
Fix indenting
ndb/src/mgmapi/mgmapi.cpp:
Add DBUG_PRINT to ndb_mgm_call when we encounter arguments (Properties)
that we are going to ignore.
Useful in debugging additions to mgmapi.
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
ndb/include/transporter/TransporterRegistry.hpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
Add calls to mgmd after setting up connections.
(not fully functional yet, checkin for pull)
ndb/include/mgmcommon/ConfigRetriever.hpp:
add get_mgmHandle() member function
ndb/include/transporter/TransporterRegistry.hpp:
Add remoteNodeId parameter to add_transporter interface
add get_transporter() and get_localNodeID()
these are required for getting the right information out of TransporterRegistry to inform mgmd of what ports we use to connect to other nodes.
ndb/src/common/mgmcommon/IPCConfig.cpp:
call add_transporter_interface with the new nodeId2 parameter
ndb/src/common/transporter/TransporterRegistry.cpp:
Implement additional (remoteNodeId) parameter in add_transporter_interface
Implement get_transporter()
ndb/src/kernel/main.cpp:
Call ndb_mgm_set_connection_int_parameter() to tell mgmd what ports we use to connect to other nodes.
ndb/src/kernel/vm/Configuration.hpp:
add get_config_retriever()
ndb/src/mgmapi/mgmapi.cpp:
Add DBUG_ENTER call to ndb_mgm_set_connection_int_parameter
ndb/src/ndbapi/TransporterFacade.hpp:
Add get_registry()
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Add call to ndb_mgm_set_connection_int_parameter to tell mgmd what ports we use to connect to other nodes.
ndb/test/include/HugoOperations.hpp:
Fix pkRead on ordered index
ndb/test/ndbapi/testPartitioning.cpp:
Update test prg to handled ordered indexes aswell
ndb/test/src/HugoOperations.cpp:
Fix pkRead on ordered index
ndb/test/src/HugoTransactions.cpp:
Fix pkRead on ordered index
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Fix setting of dist keys for ordered indexes
ndb/src/ndbapi/NdbOperationSearch.cpp:
Remove support for combined distribution key and range scan
sql/ha_ndbcluster.cc:
Merge error with wl2126
ndb/include/kernel/AttributeHeader.hpp:
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/DbtupRoutines.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/include/HugoOperations.hpp:
Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
ndb/test/src/HugoOperations.cpp:
Auto merged
ndb/test/src/HugoTransactions.cpp:
Auto merged
ndb/test/src/UtilTransactions.cpp:
Auto merged
ndb/tools/select_count.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
SCCS merged
ndb/src/ndbapi/NdbDictionary.cpp:
SCCS merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
SCCS merged
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Fix printout
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Set distribution key for ordered indexes
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Allow create_index_object to modify index_table
ndb/tools/restore/consumer_restore.cpp:
Allow create_index_object to modify index_table
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Fix printout of SCAN_TABREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Set correct status on scanfrag record
ndb/src/ndbapi/NdbScanOperation.cpp:
Fix setting of distribution key wrt scan
ndb/tools/select_count.cpp:
Fix select_count
+more code reuse
+easier testing of indexes
ndb/include/ndbapi/NdbDictionary.hpp:
Remove unimplemented enums
ndb/test/include/HugoOperations.hpp:
Pass index on constructor
ndb/test/include/HugoTransactions.hpp:
Pass index on constructor
ndb/test/include/UtilTransactions.hpp:
Pass index on constructor
ndb/test/src/HugoAsynchTransactions.cpp:
Pass index on constructor
ndb/test/src/HugoOperations.cpp:
Use getOperation to select operation type
ndb/test/src/HugoTransactions.cpp:
Use HugoOpertaions to run transactions
ndb/test/src/UtilTransactions.cpp:
Use HugoOpertaions to run transactions
fix scan take over
ndb/include/kernel/AttributeDescriptor.hpp:
remove deprecated bits
ndb/include/kernel/signaldata/DictTabInfo.hpp:
removed deprecated parameters
moved never implemented to Unimplemented
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
removed deprecated parameters
moved never implemented to Unimplemented
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
removed deprecated parameters
moved never implemented to Unimplemented
ndb/src/kernel/vm/MetaData.hpp:
removed deprecated parameters
moved never implemented to Unimplemented
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
removed deprecated parameters
moved never implemented to Unimplemented
ndb/src/ndbapi/NdbScanOperation.cpp:
Do scan take over via distribution key code
ndb/docs/wl2077.txt:
Add result from micro benchmark with shm-transporter
ndb/include/transporter/TransporterRegistry.hpp:
Move pid into transporter registry
ndb/src/common/transporter/SHM_Transporter.cpp:
Move pid into transporter registry
ndb/src/common/transporter/TransporterRegistry.cpp:
Move pid into transporter registry
ndb/src/kernel/main.cpp:
Move pid into transporter registry
ndb/src/ndbapi/TransporterFacade.cpp:
Move pid into transporter registry
ndb/src/kernel/vm/Configuration.cpp:
changed back to just restricting mac meta objects in dict to make sure we can "always" confiure ourselves out of unforseen limits
handled mixed tcp/shm transporters
+ bug#7124
ndb/src/common/transporter/SHM_Transporter.cpp:
Add remote/own pid for signaling availability of data on shm-segment
ndb/src/common/transporter/SHM_Transporter.hpp:
Add remote/own pid for signaling availability of data on shm-segment
ndb/src/common/transporter/TransporterRegistry.cpp:
Add remote/own pid for signaling availability of data on shm-segment
ndb/src/kernel/main.cpp:
Set pid to use for shm-signaling
ndb/src/mgmsrv/ConfigInfo.cpp:
bug#7124
ndb/src/ndbapi/TransporterFacade.cpp:
Set pid to use for shm-signaling
Add facility to report back to ndb_mgmd what port was used for a connection.
We do not actually do the reporting back yet.
ndb/include/mgmapi/mgmapi_debug.h:
Add prototype for ndb_mgm_set_connection_int_parameter
ndb/src/mgmapi/mgmapi.cpp:
Add ndb_mgm_set_connection_int_parameter.
Do 'set connection parameter' ndb_mgm_call
ndb/src/mgmsrv/MgmtSrvr.cpp:
Add MgmtSrvr::setConnectionDbParameter.
Find the connection between node1 and node2,
ndb/src/mgmsrv/MgmtSrvr.hpp:
Add prototype for setConnectionDbParameter
ndb/src/mgmsrv/Services.cpp:
Add 'set connection parameter' cmd and MgmApiSession::setConnectionParameter handler.
ndb/src/mgmsrv/Services.hpp:
add setConnectionParameter prototype.
