ndb/include/kernel/signaldata/TcContinueB.hpp:
Test NODE_FAILREP arraving before TCKEYCONF w.r.t simple/dirty read
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Test NODE_FAILREP arraving before TCKEYCONF w.r.t simple/dirty read
ndb/src/ndbapi/NdbConnection.cpp:
Test NODE_FAILREP arraving before TCKEYCONF w.r.t simple/dirty read
ndb/src/ndbapi/Ndbif.cpp:
Test NODE_FAILREP arraving before TCKEYCONF w.r.t simple/dirty read
ndb/test/ndbapi/testNodeRestart.cpp:
Test NODE_FAILREP arraving before TCKEYCONF w.r.t simple/dirty read
ndb/include/ndbapi/NdbConnection.hpp:
Support for handling NF during dirty read
ndb/include/ndbapi/NdbReceiver.hpp:
Support for handling NF during dirty read
ndb/src/ndbapi/NdbConnection.cpp:
Support for handling NF during dirty read
ndb/src/ndbapi/NdbReceiver.cpp:
Support for handling NF during dirty read
ndb/src/ndbapi/Ndbif.cpp:
Support for handling NF during dirty read
ndb/src/ndbapi/ndberror.c:
Support for handling NF during dirty read
ndb/test/ndbapi/testNodeRestart.cpp:
Support for handling NF during dirty read
ndb/include/mgmapi/mgmapi.h:
ndb_mgm: fix dump and signal log (more to do)
ndb/src/common/debugger/signaldata/SignalNames.cpp:
ndb_mgm: fix dump and signal log (more to do)
ndb/src/mgmapi/mgmapi.cpp:
ndb_mgm: fix dump and signal log (more to do)
ndb/src/mgmclient/CommandInterpreter.cpp:
ndb_mgm: fix dump and signal log (more to do)
ndb/include/kernel/signaldata/TcKeyConf.hpp:
A bit for differenciating between "real" tckey conf and simple read conf
ndb/include/ndbapi/Ndb.hpp:
Removed/ifdef's unused stuff
ndb/include/ndbapi/NdbConnection.hpp:
Added bitmask that keeps track of used nodes when
a transaction can be dependant on several nodes
ndb/include/ndbapi/NdbOperation.hpp:
removed unused methods
ndb/include/ndbapi/NdbReceiver.hpp:
Tween execTCOPCONF to handle TcKeyConf::SimpleReadBit
ndb/src/common/debugger/signaldata/TcKeyConf.cpp:
Update printer
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
removed unused define
ndb/src/ndbapi/NdbApiSignal.cpp:
Fix length of TC_COMMITREQ
ndb/test/ndbapi/testOperations.cpp:
fix simple/dirty read
mysql-test/r/ndb_index_ordered.result:
test case
mysql-test/t/ndb_index_ordered.test:
test case
ndb/include/kernel/signaldata/ScanTab.hpp:
Split exclusive/keyinfo
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Add possibility retreive sorted flag
ndb/include/ndbapi/NdbOperation.hpp:
Add possibility retreive lock mode
ndb/include/ndbapi/NdbResultSet.hpp:
Add possibility to get operation
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Split exclusive/keyinfo
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Store flags in ScanFragReq::requestInfo format
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Store flags in ScanFragReq::requestInfo format
ndb/src/ndbapi/NdbOperationDefine.cpp:
Keep theLockMode up-to-date
ndb/src/ndbapi/NdbScanOperation.cpp:
Keep theLockMode up-to-date
sql/ha_ndbcluster.cc:
Use NdbIndexScanOperation::reset_bounds when
performing second index access
ndb/include/ndbapi/NdbConnection.hpp:
Add support for removing op from list
ndb/include/ndbapi/NdbScanOperation.hpp:
virtual destructor
ndb/src/ndbapi/NdbConnection.cpp:
Add support for removing op from list
ndb/src/ndbapi/NdbScanOperation.cpp:
Set magic number to invalid before first prepareSendScan
(so that prepareSendScan is only called once incase of restarts)
ndb/src/ndbapi/Ndblist.cpp:
Use correct type
ndb/test/src/UtilTransactions.cpp:
Update test prg.
- use LM_Read to maintain locks
- set iop = null on temporary error (restart transaction)
into mysql.com:/home/jonas/src/mysql-4.1-ndb
ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
- Send BOUNDS as KEYINFO
- At restart, only reset KEYINFO
--
Fix resource shortage at KEYINFO in Dbtc and Dblqh w.r.t scan
--
ndb/include/kernel/signaldata/AttrInfo.hpp:
Let NdbScanOperation access AttrInfo
ndb/include/kernel/signaldata/KeyInfo.hpp:
Let NdbScanOperation access AttrInfo
ndb/include/kernel/signaldata/ScanFrag.hpp:
Send KeyLen in ScanFragReq (for range scans)
ndb/include/kernel/signaldata/ScanTab.hpp:
Send KeyLen in ScanTabReq (for range scans)
ndb/include/ndbapi/NdbConnection.hpp:
Function for adding op to list
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
new method for saving BOUNDS
ndb/include/ndbapi/NdbOperation.hpp:
Remove bounds stuff from NdbOperation and put it into NdbScanOperation
ndb/include/ndbapi/NdbScanOperation.hpp:
reset bounds
ndb/src/common/debugger/signaldata/Makefile.am:
New signal data printer for ScanFrag
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Fix printout
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
New signal data printer for ScanFrag
ndb/src/kernel/blocks/backup/Backup.cpp:
Updated ScanFragReq
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Use same sendKeyInfo for both acckeyreq and tux_bounds
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Let range scan use KEYinfo for bounds instead of attrinfo
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Let range scan use KEYinfo for bounds instead of attrinfo
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Handle keyinfo in range scan
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
Skip useless 5 words in beginning of TuxBounds
ndb/src/kernel/blocks/suma/Suma.cpp:
Fix SCAN_FRAGREQ
ndb/src/ndbapi/NdbConnection.cpp:
reset bounds
ndb/src/ndbapi/NdbOperation.cpp:
Remove bounds
ndb/src/ndbapi/NdbOperationDefine.cpp:
Remove bounds stuff
ndb/src/ndbapi/NdbOperationInt.cpp:
Remove bounds stuff
ndb/src/ndbapi/NdbScanOperation.cpp:
Send BOUNDS in KEYINFO instead of ATTRINFO
switch to using my_ for heap allocations
ndb/include/util/NdbAutoPtr.hpp:
addes auto pointer class for using with my_ functions
ndb/src/mgmclient/CommandInterpreter.cpp:
switch to using my_ for heap allocations
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/sql_table.cc:
Auto merged
sql/ha_ndbcluster.cc:
Merge: ndb_discover_tables should no longer be called when server is starting
move lockmode from scan operation to operation
added read tuple with lock mode
ndb/include/ndbapi/NdbIndexOperation.hpp:
added read tuple with lock mode
ndb/include/ndbapi/NdbOperation.hpp:
move lockmode from scan operation to operation
ndb/include/ndbapi/NdbScanOperation.hpp:
move lockmode from scan operation to operation
ndb/src/ndbapi/NdbIndexOperation.cpp:
added read tuple with lock mode
ndb/src/ndbapi/NdbOperationDefine.cpp:
added read tuple with lock mode
sql/ha_ndbcluster.cc:
set correct lockmode in all reads...
moved lockmode from scan operatoin to operation
added some debug printouts
some changes in ndbcluster_init to make start of mysqld first work
ndb/include/mgmcommon/ConfigRetriever.hpp:
removed init on ConfigRetriever
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
removed init on ConfigRetriever
added some debug printouts
ndb/src/kernel/vm/Configuration.cpp:
removed init on ConfigRetriever
ndb/src/ndbapi/ndb_cluster_connection.cpp:
removed init on ConfigRetriever
added sleep in retry
sql/ha_ndbcluster.cc:
some changes in ndbcluster_init to make start of mysqld first work
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
