into mysql.com:/home/marty/MySQL/mysql-5.0
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
merge
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
merge
mysql-test/r/ndb_blob.result:
bug#19956 : var* pk
mysql-test/t/ndb_blob.test:
bug#19956 : var* pk
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
bug#19956 - check var* length bytes and zero rest of value if any blob attribute
ndb/src/ndbapi/NdbOperationSearch.cpp:
bug#19956 - check var* length bytes and zero rest of value if any blob attribute
ndb: ndb_waiter disconnect/reconnect on get status error
ndb/src/mgmapi/mgmapi.cpp:
ndb: added some missing error codes to mgmapi
ndb/tools/waiter.cpp:
ndb: ndb_waiter disconnect/reconnect on get status error
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
mysql-test/t/rpl_temporary.test:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
- not having lock can cause "block number list" to become corrupt => crash
- also may result in 2 threads receiving same block no => possble cause of
Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd
ndb/src/mgmsrv/MgmtSrvr.cpp:
ndb: added missing lock of mutex
ndb/test/ndbapi/Makefile.am:
enable testInterpreter
ndb/test/ndbapi/testInterpreter.cpp:
add test case Bug19537
the bug fix also fixed IncValue64 for whatever reason..
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
bug#19537: write_attr: perform arithmetic conversion Uint64 to Uint32
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/src/ndbapi/DictCache.cpp:
Auto merged
ndb/src/ndbapi/DictCache.hpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/ndbapi/ndb_cluster_connection.hpp:
manual merge
ndb/src/ndbapi/ClusterMgr.cpp:
manual merge
ndb/src/ndbapi/ClusterMgr.hpp:
manual merge
- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid
ndb/include/ndbapi/ndb_cluster_connection.hpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ClusterMgr.cpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ClusterMgr.hpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/DictCache.cpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/DictCache.hpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/TransporterFacade.hpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
sql/ha_ndbcluster.cc:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
mysql-test/r/ndb_autodiscover3.result:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
mysql-test/t/ndb_autodiscover3.test:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
mysql-test/r/ndb_condition_pushdown.result:
bug#17421, changes NDB API pushdown LIKE arg to plain char
mysql-test/t/ndb_condition_pushdown.test:
bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/include/ndbapi/NdbOperation.hpp:
bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/include/util/NdbSqlUtil.hpp:
bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/src/common/util/NdbSqlUtil.cpp:
bug#17421, changes NDB API pushdown LIKE arg to plain char
into mysql.com:/space/pekka/ndb/version/my50
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/t/ndb_blob.test:
Auto merged
ndb/include/kernel/signaldata/TcKeyReq.hpp:
Auto merged
ndb/include/ndbapi/NdbBlob.hpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/sql_table.cc:
Auto merged
ndb/tools/delete_all.cpp:
nuts
- addded more retries to wait for nodefailure to complete
Bug #19039 multi node failure causes node failure handling not to complete
- patch to avoid this scenario when the management server is used to perform the stop
- wait for NF_COMPLETE_REP in management server before returning
ndb: allocate nodeid
- only retry on retryable error
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
merge
Unleash backup to write more than 32k at a time
Using parameter BackupMaxWriteSize
(greatly affect LCP time in 5.1, set default value to 256k)
ndb/include/mgmapi/mgmapi_config_parameters.h:
Add config fro max write size in backup
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Unleash backup to write more than 32k at a time
ndb/src/mgmsrv/ConfigInfo.cpp:
Add config fro max write size in backup
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/include/util/SocketServer.hpp:
Auto merged
ndb/src/common/transporter/Transporter.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Fix alignment of sockaddr(_in)
ndb/src/common/transporter/Transporter.cpp:
Fix alignment of sockaddr(_in)
ndb/src/mgmsrv/Services.cpp:
Fix alignment of sockaddr(_in)
ndb_mgmd limited no of api nodes, by restricting no of mgmsessions
(these are used for dynamic port allocation)
ndb/include/util/SocketServer.hpp:
Increase default max session to ~0
ndb/src/common/util/SocketServer.cpp:
Increase default max session to ~0
Handle early abort of scan, so that resources are correctly freed
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Handle early abort
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Handle early abort so that require on running.empty() does not fire
