- 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
into mysql.com:/home/jonas/src/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
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/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/testBackup.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/test/src/NdbBackup.cpp:
Auto merged
Redo abort handling according to descr. in Backup.txt
bug#9960 - ndb backup
increase wait completed timeout to 48 hours
ndb/include/kernel/signaldata/BackupImpl.hpp:
Add nodeid to reply to be able to fake reply during NF
ndb/include/kernel/signaldata/BackupSignalData.hpp:
new error codes
ndb/src/common/debugger/signaldata/BackupImpl.cpp:
fix printout
ndb/src/kernel/blocks/backup/Backup.cpp:
bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.hpp:
bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.txt:
bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/BackupInit.cpp:
bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Init own version
ndb/src/mgmapi/mgmapi.cpp:
bug#9960 - ndb backup
increase wait completed timeout to 48 hours
ndb/src/mgmsrv/MgmtSrvr.cpp:
Handle node failures activly
(mainly for backup...)
ndb/src/mgmsrv/MgmtSrvr.hpp:
Handle node failures activly
(mainly for backup...)
ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
Handle node failures activly
(mainly for backup...)
ndb/src/ndbapi/ndberror.c:
new error codes
ndb/test/ndbapi/testBackup.cpp:
fix return codes
ndb/test/run-test/daily-basic-tests.txt:
Add failure test cases to autotest
ndb/test/src/NdbBackup.cpp:
fix error codes
introduce checking of backup resources after each test
into mysql.com:/home/jonas/src/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Fix gci reply on TC_COMMITREQ
(prefered way of mysqld)
ndb/include/kernel/signaldata/TcCommit.hpp:
Fix gci reply on TC_COMMITREQ
(prefered way of mysqld)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Fix gci reply on TC_COMMITREQ
(prefered way of mysqld)
ndb/src/ndbapi/NdbTransaction.cpp:
Fix gci reply on TC_COMMITREQ
(prefered way of mysqld)
ndb/include/ndbapi/NdbScanOperation.hpp:
release scan op early to save memory
ndb/src/ndbapi/NdbScanOperation.cpp:
release scan op early to save memory
ndb/src/ndbapi/NdbTransaction.cpp:
release scan op early to save memory
ndb/src/ndbapi/Ndblist.cpp:
release scan op early to save memory
sql/ha_ndbcluster.cc:
release scan op early to save memory
mysql-test/Makefile.am:
divide schemafile in blocks to allow unlimited # objects
ndb/include/debugger/SignalLoggerManager.hpp:
divide schemafile in blocks to allow unlimited # objects
ndb/include/kernel/ndb_limits.h:
divide schemafile in blocks to allow unlimited # objects
ndb/src/common/debugger/SignalLoggerManager.cpp:
divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
divide schemafile in blocks to allow unlimited # objects
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
divide schemafile in blocks to allow unlimited # objects
ndb/test/ndbapi/testDict.cpp:
divide schemafile in blocks to allow unlimited # objects
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
fix readTuples signature
ndb/include/ndbapi/NdbScanOperation.hpp:
fix readTuples signature
ndb/src/ndbapi/NdbScanOperation.cpp:
fix readTuples signature
ndb/test/include/HugoTransactions.hpp:
fix readTuples signature
ndb/test/ndbapi/testScanPerf.cpp:
fix readTuples signature
ndb/test/src/HugoOperations.cpp:
fix readTuples signature
ndb/test/src/HugoTransactions.cpp:
fix readTuples signature
ndb/test/ndbapi/testOIBasic.cpp:
fix readTuples signature
ndb/include/kernel/signaldata/AccScan.hpp:
TUP scan for testing in 5.0
ndb/include/kernel/signaldata/NextScan.hpp:
TUP scan for testing in 5.0
ndb/include/kernel/signaldata/ScanFrag.hpp:
TUP scan for testing in 5.0
ndb/include/kernel/signaldata/ScanTab.hpp:
TUP scan for testing in 5.0
ndb/src/common/debugger/signaldata/ScanTab.cpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtup/Makefile.am:
TUP scan for testing in 5.0
ndb/test/ndbapi/testScan.cpp:
TUP scan for testing in 5.0
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
BitKeeper/etc/logging_ok:
auto-union
include/m_ctype.h:
Auto merged
innobase/btr/btr0pcur.c:
Auto merged
innobase/include/btr0pcur.h:
Auto merged
innobase/include/os0file.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/user_var.test:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-mb.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
ul
ndb/include/ndbapi/NdbScanOperation.hpp:
ul
ndb/src/ndbapi/NdbIndexOperation.cpp:
ul
ndb/src/ndbapi/NdbOperationDefine.cpp:
ul
ndb/src/ndbapi/NdbOperationSearch.cpp:
ul
ndb/src/ndbapi/NdbScanOperation.cpp:
ul
sql/field.cc:
manually merged, because bk messed it up
sql/sql_yacc.yy:
merged
ndb/include/ndbapi/NdbConnection.hpp:
release scan op of hupped trans at scan close to save memory
ndb/include/ndbapi/NdbScanOperation.hpp:
release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbConnection.cpp:
release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbResultSet.cpp:
release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbScanOperation.cpp:
release scan op of hupped trans at scan close to save memory
ndb/tools/desc.cpp:
release scan op of hupped trans at scan close to save memory
into hundin.mysql.fi:/home/heikki/mysql-5.0
innobase/log/log0recv.c:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/include/mgmapi/mgmapi_config_parameters.h:
Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/mgmsrv/ConfigInfo.cpp:
Reenable MAX_OPEN_FILES to enable LCP in some situations
debug printouts
ndb documentation update
ndb/include/ndbapi/Ndb.hpp:
ndb documentation update
ndb/src/kernel/blocks/suma/Suma.cpp:
fixed mem leak in subscriction handling in Suma
debug printouts
ndb/src/kernel/blocks/suma/Suma.hpp:
fixed mem leak in subscriction handling in Suma
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/include/kernel/signaldata/SumaImpl.hpp:
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
fixed bug in event handling of several tables
ndb/include/kernel/signaldata/CreateEvnt.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/include/kernel/signaldata/CreateIndx.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/src/ndbapi/ndberror.c:
remove obsolete attribute storage type ACC vs TUP
ndb/test/include/NdbSchemaOp.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/test/ndbapi/bench/userInterface.cpp:
remove obsolete attribute storage type ACC vs TUP
ndb/test/src/NdbSchemaOp.cpp:
remove obsolete attribute storage type ACC vs TUP
move internal mgmapi functions into it.
should also fix AIX build problem.
ndb/include/mgmapi/mgmapi.h:
Move ndb_mgm_convert_to_transporter to mgmapi_internal.h
Should fix AIX build problem
ndb/include/mgmapi/mgmapi_debug.h:
Move ndb_mgm_(get|set)_connection_int_parameter to mgmapi_internal.h
ndb/src/common/transporter/Makefile.am:
Add ndb/src/mgmapi to include for common/transporter (TransporterRegistry requires the use of mgmapi_internal.h)
ndb/src/common/transporter/TransporterRegistry.cpp:
Use mgmapi_internal.h
ndb/src/mgmapi/mgmapi.cpp:
some functions defined in mgmapi_internal.h
ndb/src/ndbapi/ndb_cluster_connection.cpp:
use functions from mgmapi_internal.h
into mysql.com:/home/jonas/src/mysql-4.1
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
set exec_flag in execTC_COMMITREQ so that api will get rollbackrep
ndb/include/ndbapi/NdbConnection.hpp:
Make getConnectedNode public
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Fix TC_COMMITREQ in abort cases
ndb/test/ndbapi/testNodeRestart.cpp:
Testcase for bug#8853
ndb/test/run-test/daily-devel-tests.txt:
Testcase for bug#8853
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
ndb/include/kernel/signaldata/CreateIndx.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
More explicit naming of variables
ndb/include/kernel/signaldata/AlterIndx.hpp:
Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/BuildIndx.hpp:
Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/CreateIndx.hpp:
Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/CreateTrig.hpp:
Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/DropIndx.hpp:
Add union to indicate where master node is passed in ref
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Set error/master node also on BuildIndxRef
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Use masterNodeId instead of errornode
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/include/kernel/signaldata/CreateIndx.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-4.1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
remove dict forwarding
add api retries on NotMaster
ndb/include/kernel/signaldata/AlterIndx.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/BuildIndx.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/CreateIndx.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/CreateTrig.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/DropIndx.hpp:
Add NotMaster error code
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Never forward requests,
instead REF to API who will retry towards correct node
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
1) Set error code for timeout
2) Handle NotMaster with retry in all DICT requests
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Fix so that input values is in seconds and not 100ms's
sql/ha_ndbcluster.cc:
Wait 3 sec for all nodes to connect...
ndb/include/mgmapi/mgmapi.h:
ndb_mgm_convert_to_transporter may destroy the handle, now takes a pointer.
ndb/include/mgmcommon/ConfigRetriever.hpp:
If outside code is going to manipulate the NdbMgmHandle, allow it to do it
via a get_mgmHandlePtr() call
ndb/include/transporter/TransporterRegistry.hpp:
connect_client and connect_ndb_mgmd may destroy the handle, now they take a pointer.
ndb/src/common/transporter/TransporterRegistry.cpp:
When start_service is binding to ports, report back the port numbers.
We need this here now, as we re-use the initial mgm connection as a transporter, which
is connected *before* start_service has allocated the dynamic port numbers. So the creation
of this early transporter cannot be used to send the dynamic ports to the mgmd.
We connect to the mgm server (using the handle that will be used in the client_Connect thread)
if needed. This is thread safe as start_service is only ever called once, before
the client connect thread starts.
connect_client,connect_ndb_mgmd may destroy the NdbMgmHandle. It now accepts a pointer to it.
ndb/src/kernel/vm/Configuration.cpp:
Copy the m_mgmd_host string from the config_retreiver as the NdbMgmHandle in the
ConfigRetreiver will be destroyed later (along with the host string).
globalTransporterRegistry.connect_client will destroy the mgm handle, use a pointer to the handle.
ndb/src/kernel/vm/Configuration.hpp:
allow the dynamic allocation of m_mgmd_host.
ndb/src/mgmapi/mgmapi.cpp:
accept a pointer for ndb_mgm_convert_to_transporter as we destroy the handle.
ndb/include/mgmapi/mgmapi.h:
Add mgmapi call: ndb_mgm_get_mgmd_nodeid()
- returns the node id that the handle is connected to.
- returns 0 on error.
ndb/include/transporter/TransporterRegistry.hpp:
Add TransporterRegistry::connect_client(NdbMgmHandle h)
- uses a connected NdbMgmHandle to connect to the mgm server as a client.
- sets up a transporter connection
- used to transform the initial mgm connection (used for fetching configuration)
into a transporter connection
Added connect_ndb_mgmd(NdbMgmHandle h)
- turn the supplied mgm connection into a transporter connection
- return the socket
Improve comments on connect_ndb_mgmd(SocketClient)
ndb/src/common/transporter/Transporter.cpp:
Add Transporter::connect_client(NDB_SOCKET_TYPE)
- use an existing socket to make a transporter connection
ndb/src/common/transporter/Transporter.hpp:
Add connect_client(NDB_SOCKET_TYPE)
ndb/src/common/transporter/TransporterRegistry.cpp:
Add TransporterRegistry::connect_client(NdbMgmHandle)
- use an existing mgm connection to connect a transporter
- used to change the mgm connection used for fetching configuration into a transporter
Add connect_ndb_mgmd(NdbMgmHandle)
- use existing NdbMgmHandle
- convert to transporter
- return socket
ndb/src/kernel/vm/Configuration.cpp:
After fetching configuration, use the mgm connection as a transporter.
Fail fatally if this fails.
ndb/src/mgmapi/mgmapi.cpp:
Add ndb_mgm_get_mgmd_nodeid(h)
- returns the node id of the mgm server you're connected to.
ndb/src/mgmsrv/Services.cpp:
Add "get mgmd nodeid" mgmd call
returns 'nodeid' - the node id of the mgm server your connected to
ndb/src/mgmsrv/Services.hpp:
add prototype for get_mgmd_nodeid
