into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/test/src/NdbBackup.cpp:
Auto merged
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysqltest.c:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/vm/Emulator.cpp:
Auto merged
ndb/src/kernel/vm/Emulator.hpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/tools/ndb_config.cpp:
Auto merged
ndb/tools/restore/consumer_restore.cpp:
Auto merged
mysql-test/t/openssl_1.test:
Manual merge
ndb/include/util/ndb_opts.h:
Manual merge
ndb/tools/Makefile.am:
Manual merge
ndb/tools/restore/restore_main.cpp:
Manual merge
into eel.(none):/home/jonas/src/mysql-5.0
ndb/include/kernel/signaldata/SignalData.hpp:
Auto merged
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
merge
make sure not to cut log to early
(specificly not use LCP with maxGciStarted that has not yet completed)
ndb/include/kernel/signaldata/SignalData.hpp:
Add signal data printer for START_FRAG_REQ
ndb/include/kernel/signaldata/StartFragReq.hpp:
Add signal data printer for START_FRAG_REQ
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
Add signal data printer for START_FRAG_REQ
ndb/src/common/debugger/signaldata/StartRec.cpp:
Add signal data printer for START_FRAG_REQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Add maxGciStarted/Completed to event report
bug: dont use LCP for calcKeepGci in maxGciSTarted is not completed
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
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/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.hpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_table.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
ndb/src/ndbapi/ndberror.c:
Resolve conflicts
sql/ha_innodb.cc:
Resolve conflicts
sql/item_strfunc.cc:
Resolve conflicts
LQH computes incorrect hash values during NR (as it doesn't concider charsets)
Solution: make LQH compute correct hash :-)
1) move xfrm_key into SimulatedBlock so that there's _one_ impl.
2) make TC, ACC, LQH use same impl.
ndb/include/kernel/AttributeDescriptor.hpp:
Make SimulatedBlock use AttributeDescriptor (to xfrm)
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Move xfrm handling into SimulatedBlock
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Move xfrm handling into SimulatedBlock
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Move xfrm handling into SimulatedBlock
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Move xfrm handling into SimulatedBlock
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Move xfrm handling into SimulatedBlock
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Move xfrm handling into SimulatedBlock
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Move xfrm handling into SimulatedBlock
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Move xfrm handling into SimulatedBlock
ndb/src/kernel/vm/SimulatedBlock.cpp:
Move xfrm handling into SimulatedBlock
ndb/src/kernel/vm/SimulatedBlock.hpp:
Move xfrm handling into SimulatedBlock
into eel.(none):/home/jonas/src/mysql-5.0
mysql-test/r/ndb_alter_table.result:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/kernel/SimBlockList.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/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/DictCache.cpp:
Auto merged
ndb/src/ndbapi/DictCache.hpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysql-test/t/ndb_alter_table.test:
merge
ndb/src/common/util/version.c:
merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
merge
into eel.(none):/home/jonas/src/mysql-4.1-push
mysql-test/t/ndb_config.test:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysql-test/t/ndb_alter_table.test:
merge
Split table version into 2 (major, minor)
Impl. signaling to API when table has been altered
Allow running transactions to use any minor number for transactions
mysql-test/r/ndb_alter_table.result:
Allow running transactions to use old table definition when possible.
mysql-test/t/ndb_alter_table.test:
Allow running transactions to use old table definition when possible.
ndb/include/kernel/BlockNumbers.h:
remove GREP
ndb/include/kernel/GlobalSignalNumbers.h:
Add ALTER_TABL_REP and API_BROADCAST_REP
ndb/include/kernel/kernel_types.h:
table_version_major
ndb/include/kernel/signaldata/AlterTable.hpp:
New error code for alter table during rolling upgrade
ndb/include/ndbapi/NdbDictionary.hpp:
Add state on table object to represent an altered but still valid table object
ndb/src/common/debugger/BlockNames.cpp:
remove GREP
ndb/src/common/util/version.c:
Fix upgrades
ndb/src/kernel/SimBlockList.cpp:
remove GREP
ndb/src/kernel/blocks/Makefile.am:
remove GREP
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
remove GREP
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Split tableSchemaVersion into 2 part
24 bit real version
8 bit for online alter table where old table definition is still usable
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Check for same ndb versions
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
Update schema printer
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
remove grep
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
1) Use table_ version_major when checking table version
2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
1) Use table_ version_major when checking table version
2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
1) Use table_ version_major when checking table version
2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
remove GREP
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Add support for sending REP to ALL api nodes
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Add support for sending REP to ALL api nodes
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Add support for sending REP to ALL api nodes
ndb/src/kernel/blocks/suma/Suma.cpp:
remove GREP
ndb/src/mgmsrv/MgmtSrvr.cpp:
remove GREP
ndb/src/ndbapi/DictCache.cpp:
Add support for alter_table_rep
by setting status to Altered
NOTE special handling of tables in state RETREIVING
ndb/src/ndbapi/DictCache.hpp:
Add support for alter_table_rep
by setting status to Altered
NOTE special handling of tables in state RETREIVING
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Change alter table so that remove from global cache is used wo/ retreiving it from there first
as ALTER_TABLE_REP might already have changed the table object...
ndb/src/ndbapi/TransporterFacade.cpp:
Add support for ALTER_TABLE_REP
sql/ha_ndbcluster.cc:
Allow running transactions to use tables in state ALTERED...but new transactions may not...
ndb/include/kernel/signaldata/ApiBroadcast.hpp:
New BitKeeper file ``ndb/include/kernel/signaldata/ApiBroadcast.hpp''
make previous patch portable by abstracting to Ndb_check_socket_hup.
Is in portlib rather than mysys due to the socket parameter being NDB_SOCKET_TYPE
ndb/include/portlib/NdbTCP.h:
Add Ndb_check_socket_hup prototype
ndb/src/common/portlib/NdbTCP.cpp:
Implement Ndb_check_socket_hup for unix like systems using the poll system call.
ndb/src/common/portlib/win32/NdbTCP.c:
Implement Ndb_check_socket_hup(NDB_SOCKET_TYPE) for win32 using the select() call.
(should work okay - unable to test on win32 due to status of ndb port though)
ndb/src/mgmapi/mgmapi.cpp:
Use the portable (portlib) Ndb_check_socket_hup to check socket status
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into mysql.com:/home/jonas/src/mysql-4.1-push
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Fix LCP during SR parameters
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fix LCP during SR parameters
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Fix LCP during SR parameters
ndb/src/mgmsrv/ConfigInfo.cpp:
Fix LCP during SR parameters
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
merge
ndb/tools/Makefile.am:
merge
ndb/include/mgmapi/mgmapi.h:
Add feature to redirect error printouts
ndb/src/mgmapi/mgmapi.cpp:
Add feature to redirect error printouts
ndb/src/mgmsrv/ConfigInfo.hpp:
Make param info public
ndb/tools/Makefile.am:
Add ndb_config
ndb/tools/config.cpp:
New BitKeeper file ``ndb/tools/config.cpp''
Reset missed heartbeat count on receipt of signal from node.
This fixes a bug where that under high network load, the heartbeat packets could be
delayed, causing the appearance of node failure (due to lost heartbeats).
ndb/include/kernel/NodeInfo.hpp:
Add m_heartbeat_cnt to track missed heartbeats
ndb/include/transporter/TransporterCallback.hpp:
add prototype for transporter_recv_from()
Called on receipt from a node.
ndb/src/common/transporter/TransporterRegistry.cpp:
Add calls to transporter_receive_from when data is received (before unpack)
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
remove NodeRec::alarmCount. missed heartbeat count now kept in NodeInfo
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Use NodeInfo::m_heartbeat_cnt for missed heartbeat count
ndb/src/kernel/vm/TransporterCallback.cpp:
add transporter_recv_from(), which is called on receipt of signals.
It resets missed heartbeat count for that node.
ndb/src/ndbapi/ClusterMgr.cpp:
Use NodeInfo::m_heartbeat_cnt for missed heartbeat count
ndb/src/ndbapi/ClusterMgr.hpp:
Use NodeInfo::m_heartbeat_cnt instead of ClusterMgr::Node::hbSent for missed
heartbeat count.
We now use the same storage for API and Kernel heartbeats.
Add ClusterMgr::hb_received(nodeId) to reset hbSent (as if we received a heartbeat,
but callable from elsewhere - e.g. when signal received)
ndb/src/ndbapi/TransporterFacade.cpp:
Implement transporter_recv_from for ndbapi - which resets hbSent
ndb/src/ndbapi/TransporterFacade.hpp:
Add hb_received(nodeId)
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/test/ndbapi/testBackup.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/tools/drop_index.cpp:
Auto merged
ndb/tools/listTables.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
merge
ndb/src/ndbapi/ndberror.c:
merge
ndb/test/include/HugoOperations.hpp:
merge
ndb/test/src/HugoOperations.cpp:
merge
fix error code to avoid clash with 5.0/5.1
ndb/include/kernel/signaldata/AlterTable.hpp:
Change error codes to remove clash from 5.0
ndb/include/kernel/signaldata/DropTable.hpp:
Change error codes to remove clash from 5.0
ndb/src/ndbapi/ndberror.c:
Change error codes to remove clash from 5.0
ndb/include/kernel/signaldata/AlterTable.hpp:
Add error code for backup in progress
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Add backup state
ndb/include/kernel/signaldata/DropTable.hpp:
Add error code for backup in progress
ndb/include/ndbapi/NdbDictionary.hpp:
Add backup state
ndb/src/kernel/blocks/backup/Backup.cpp:
1) remove invalid require (util_sequence_ref) crash
2) Don't backup objects dropping/creating
3) set correct error code on backup fragment ref (crash)
4) save TrigAttrInfo header when getting log full (crash)
5) lock/unlock tables during backup
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
1) add mutex lock/unlock as part of drop/alter table
2) add lock/unlock for backup
3) remove TC from backup trigger loop
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Add BACKUP_ONGOING state
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add backup state
ndb/src/ndbapi/ndberror.c:
Add error code for backup in progress
ndb/test/ndbapi/testBackup.cpp:
Add testcase for testBackup -n BackupDDL
ndb/tools/drop_index.cpp:
Fix ndb_drop_index
ndb/tools/listTables.cpp:
Print of backup state
mysql-test/t/ctype_utf8.test:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/transporter/Transporter.hpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
sql/sql_prepare.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
tests/mysql_client_test.c:
Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
SCCS merged
ndb/src/common/transporter/Transporter.cpp:
SCCS merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
mysql-test/t/ctype_utf8.test:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
sql/sql_prepare.cc:
Auto merged
ndb/include/util/SocketServer.hpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/SocketClient.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/mgmclient/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/include/util/ndb_opts.h:
merge
ndb/src/common/mgmcommon/IPCConfig.cpp:
merge
ndb/src/common/transporter/TransporterRegistry.cpp:
merge
ndb/src/mgmapi/mgmapi.cpp:
merge
ndb/src/mgmclient/CommandInterpreter.cpp:
merge
ndb/src/mgmsrv/MgmtSrvr.cpp:
merge
ndb/src/mgmsrv/Services.cpp:
merge
ndb/src/mgmsrv/main.cpp:
merge
ndb/src/ndbapi/TransporterFacade.cpp:
merge
added using ndb_end and showing mem allocation stat at exit
added init of variable
added destruction of LocalConfig to still memleak
added delete of theFacade on exit
stopSessions(true) on socket server to ensure destuction of threads
added destruction of arbit manager thread
added true option to stopSessions in transporter facade to ensure destructions of threads
ndb/include/util/ndb_opts.h:
added using ndb_end and showing mem allocation stat at exit
ndb/src/common/logger/LogHandler.cpp:
added init of variable
ndb/src/mgmapi/mgmapi.cpp:
added destruction of LocalConfig to still memleak
debug printouts
ndb/src/mgmclient/main.cpp:
added using ndb_end and showing mem allocation stat at exit
ndb/src/mgmsrv/MgmtSrvr.cpp:
added delete of theFacade on exit
removed area51
added debug prints
ndb/src/mgmsrv/main.cpp:
added using ndb_end and showing mem allocation stat at exit
moved glob struct to heap to enable ndb_end usage
moved options out of glob struct
stopSessions(true) on socket server to ensure destuction of threads
ndb/src/ndbapi/ClusterMgr.cpp:
added destruction of arbit manager thread
debug printouts
ndb/src/ndbapi/TransporterFacade.cpp:
added true option to stopSessions in transporter facade to ensure destructions of threads
+ debug prints
added __LINE__ so systemErrorLab for better error printout
ndb/include/ndb_version.h.in:
stilled mem leak in usage on getVersionString
ndb/include/util/version.h:
stilled mem leak in usage on getVersionString
ndb/src/common/util/version.c:
stilled mem leak in usage on getVersionString
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
added __LINE__ so systemErrorLab for better error printout
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
stilled mem leak in usage on getVersionString
added __LINE__ so systemErrorLab for better error printout
ndb/tools/restore/restore_main.cpp:
stilled mem leak in usage on getVersionString
Fix closing of sessions on mgm server shutdown.
ndb/include/mgmcommon/ConfigRetriever.hpp:
Add disconnect();
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Add disconnect() call so we can disconnect from the mgm server before it shuts down
(if we are a mgm server).
ndb/src/mgmsrv/main.cpp:
Close our ConfigRetriever connection first.
Stop sessions, and wait for them to stop. (previously we didn't wait, this was
causing core dumps on shutdown with failed nodes).
into linux.site:/home/marty/MySQL/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysys/default.c:
Auto merged
ndb/include/transporter/TransporterDefinitions.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/include/ndbapi/Ndb.hpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
ndb/include/ndbapi/Ndb.hpp:
Auto merged
ndb/src/ndbapi/Ndbif.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysql-test/r/ndb_subquery.result:
Add testing of new 4006 handling
mysql-test/t/ndb_subquery.test:
Add testing of new 4006 handling
ndb/include/ndbapi/Ndb.hpp:
Check #transactions in startTransaction instead of getNdbCon
ndb/src/ndbapi/Ndb.cpp:
Check #transactions in startTransaction instead of getNdbCon
ndb/src/ndbapi/NdbScanOperation.cpp:
Check #transactions in startTransaction instead of getNdbCon
ndb/src/ndbapi/Ndbif.cpp:
Check #transactions in startTransaction instead of getNdbCon
ndb/src/ndbapi/Ndbinit.cpp:
Check #transactions in startTransaction instead of getNdbCon
ndb/src/ndbapi/Ndblist.cpp:
Check #transactions in startTransaction instead of getNdbCon
ndb/test/ndbapi/testNdbApi.cpp:
Check #transactions in startTransaction instead of getNdbCon
ndb/test/run-test/daily-basic-tests.txt:
Check #transactions in startTransaction instead of getNdbCon
sql/ha_ndbcluster.cc:
Check #transactions in startTransaction instead of getNdbCon
into mysql.com:/home/jonas/src/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/ndbapi/DictCache.cpp:
Auto merged
ndb/src/ndbapi/DictCache.hpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
- Fix several valgrind warnings.
ndb/include/kernel/AttributeList.hpp:
Include ndb_limits.h
ndb/include/ndbapi/Ndb.hpp:
Add new function internalize_table_name
Proper formatting
ndb/include/util/SimpleProperties.hpp:
Add function "add" for adding strings/data to word buffers without reading after the string/data
Fix comment for UtilBufferWriter
ndb/src/common/util/SimpleProperties.cpp:
Add function "add" for adding strings/data to word buffers without reading after the string/data
ndb/src/ndbapi/DictCache.cpp:
Add DBUG printouts to all functions in GlobalDictCache
Change ndbout_c to DBUG_PRINT
Add function GlobalDictCache::printCache
ndb/src/ndbapi/DictCache.hpp:
Add function GlobalDictCache::printCache
ndb/src/ndbapi/Ndb.cpp:
Change DEBUG_TRACE to DBUG_PRINT, DBUG_ENTER
Use new function internalize_table_name, and create internal tabname on stack
ndb/src/ndbapi/NdbDictionary.cpp:
Add DBUG_ENTER calls
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Pass BaseString as reference when passing internal table name to internal functions.
Remove check for exceeding MAX_SECTION_SIZE.
Remove pekkas fix that saves internalName in save_me variable, not needed when tablename is stack variable.
NdbDictInterface::gettable(int tableid, ...) - Not used
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Remove include of ndb_limits.h
Use BaseString& for internal functions
Remove m_namebuf, not needed, uses m_buffer
Formatting
NdbDictInterface::getTable(int tableId, ...) - Not used
ndb/src/ndbapi/NdbImpl.hpp:
Remove buffer for m_internalname, placed on stack of caller.
Moved impl of internalize_table_name and internalize_index_anme to Ndb::internalize_table_name and Ndb::internalize_index_name
ndb/src/ndbapi/NdbLinHash.hpp:
Save also the terminating null character in chain->str to get nicer printouts.
ndb/src/ndbapi/NdbTransaction.cpp:
Remove hardcoded buffer sizes.
Remove include of ndb_limits.h
sql/ha_ndbcluster.cc:
Fix "typo", use file_name var since that is the current files name,
ndb/src/common/transporter/SCI_Transporter.cpp:
Auto merged
ndb/src/common/transporter/SCI_Transporter.hpp:
Auto merged
ndb/src/common/transporter/SHM_Transporter.cpp:
Auto merged
ndb/src/common/transporter/SHM_Transporter.hpp:
Auto merged
ndb/src/common/transporter/TCP_Transporter.cpp:
Auto merged
ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
- after review fixes
mysql-test/r/ndb_basic.result:
Test using table with long name
mysql-test/t/ndb_basic.test:
Test using table with long name
ndb/include/transporter/TransporterDefinitions.hpp:
Define constant for max section size
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add check for not sending too long table name to ndb kernel
ndb/include/kernel/ndb_limits.h:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysys/thr_alarm.c:
Manual merge
- Fix valgrind warnings
- Remove static db, schema and table name buffers from Ndb.cpp
mysys/thr_alarm.c:
Initialise sact to zero
ndb/include/kernel/ndb_limits.h:
Set MAX_ATTR_NAME_SIZE to NAME_LEN which is tha maximum in MySQL
ndb/include/kernel/signaldata/GetTabInfo.hpp:
Clean up
ndb/include/ndbapi/Ndb.hpp:
Remove NDB_MAX_INTERNAL_NAME_LENGTH and all char buffers for schema, db and tablename.
Made them dynamic and moved to NdbImpl.hpp
ndb/include/ndbapi/ndbapi_limits.h:
Remove the static length's of attr, db, schema and table name.
ndb/src/common/transporter/Packer.cpp:
Set theSignalId to ~0 when unpacking signal
ndb/src/ndbapi/Ndb.cpp:
Moved schema, database and tablename to NdbImpl.hpp
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add NdbIndexImpl::init and NdbEventImpl::init
Init all vars in NdbIndexImpl, NdbEventImpl, NdbTableImpl and NdbIndexImpl
Delete the pseudo column NDB$RANGE_NO
Copy tablename to internal buff in NdbDictInterface to get proper alignment.
Convert length of table name from bytes words, when setting sz of LinearSectionPtr
Set LinearSectionPtr array size to number of LinearSections used - save some stack.
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Add NdbEventImpl::init and NdbIndexImpl::init
Remove clearNewProperties and copyNewProperties, it's easier to check if all vars are initied if it's done in the same func.
Add buffer for tabname ti NdbDictInterface, memset it to 0 in initializer.
ndb/src/ndbapi/NdbImpl.hpp:
Use BaseString for table, schema and db names.
ndb/src/ndbapi/Ndbinit.cpp:
Move schema and db name to NdbImpl and use BaseString
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Destroy ndb_global_event_buffer_mutex and ndb_print_state_mutex
sql/ha_ndbcluster.cc:
Check if pTrans is not null before calling closeTransaction
Remove NDB_MAX_ATTR_NAME_SIZE
Remove truncation of attr names. When attr name length is same in NDB as in MySQL this will be checked in functin check_column_name
