ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.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
added debug printouts
changed mem allocation handling in event api
split single and parallell event operation testing
ndb/src/kernel/blocks/suma/Suma.cpp:
added info to dump state 8004
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
added debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
changed mem allocation handling in event api
ndb/test/ndbapi/test_event.cpp:
split single and parallell event operation testing
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
added debug printouts
ndb/test/ndbapi/testDict.cpp:
updated FragmentType tests, removed failing "equal" on the tables since they will not be equal because fragmentation is updated from the kernel
ndb/test/run-test/16node-tests.txt:
adopted test scripts to new Fragment test name
ndb/test/run-test/basic.txt:
adopted test scripts to new Fragment test name
ndb/test/run-test/daily-basic-tests.txt:
adopted test scripts to new Fragment test name
ndb/src/common/util/NdbSqlUtil.cpp:
strnxfrm bug, may not write the length it says
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
fix index in debug print
ndb/test/ndbapi/testOIBasic.cpp:
do not generate too many mb chars, not checked in TUP
configure.in:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testScan.cpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
SCCS merged
crash if scan is poped from queue before all attrinfo has arrived
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
only restart scan if all attrinfo has arrived
otherwise just set remove from queue and set state
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
new error insert - force send attrinfo
ndb/test/ndbapi/testScan.cpp:
new test bug8262 many threads - scanning small tables
ndb/test/run-test/daily-basic-tests.txt:
run new test case in autotest
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/test/include/HugoOperations.hpp:
Auto merged
ndb/test/include/NDBT_Test.hpp:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
Auto merged
ndb/test/ndbapi/flexBench.cpp:
Auto merged
ndb/test/ndbapi/flexHammer.cpp:
Auto merged
ndb/test/ndbapi/flexTT.cpp:
Auto merged
ndb/test/ndbapi/flex_bench_mysql.cpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
corrected automerge error
add abort to multi op test case
ndb/include/ndbapi/NdbConnection.hpp:
Add aborts to test case
ndb/test/include/HugoOperations.hpp:
Add aborts to test case
ndb/test/ndbapi/testOperations.cpp:
Add aborts to test case
ndb/test/src/HugoOperations.cpp:
Add aborts to test case
ndb/test/src/HugoTransactions.cpp:
Add aborts to test case
1) New testcase
Check every combination of ins/upd/del of length 5
Check reading savepoint's
2) Fix 1 liner in acc wrt committing read
ndb/include/ndbapi/NdbConnection.hpp:
Make testcase friend
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fix so that committing a READ can _not_ result in setting elementIsDisappeared
ndb/test/include/NDBT_Test.hpp:
Make copy of testcase name
ndb/test/ndbapi/testOperations.cpp:
New testcase
Check every combination of ins/upd/del of length 5
Check reading savepoint's
ndb/test/src/HugoOperations.cpp:
Close transaction in destructor
ndb/test/src/NDBT_Test.cpp:
Make copy of testcase name
ndb/test/ndbapi/flexAsynch.cpp:
Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexBench.cpp:
Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexHammer.cpp:
Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/slow_select.cpp:
Add includes as memcpy is introduced in NdbRecAttr
ndb/test/src/HugoCalculator.cpp:
Add includes as memcpy is introduced in NdbRecAttr
ndb/include/ndbapi/NdbDictionary.hpp:
NdbDictionaryColumn::getSizeInBytes
ndb/include/ndbapi/NdbOperation.hpp:
NdbOperation::getTable
ndb/include/ndbapi/NdbTransaction.hpp:
Make getConnectionNodeId public (for test programs)
ndb/include/util/Base64.hpp:
base64(void*)
ndb/src/common/util/Base64.cpp:
base64(void*)
ndb/src/kernel/blocks/ERROR_codes.txt:
New error code for REF'ing non-local TCKEYREQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Easy clearing of ERROR_INSERT
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
New error code for REF'ing non-local TCKEYREQ
ndb/src/ndbapi/NdbDictionary.cpp:
NdbDictionaryColumn::getSizeInBytes
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
If m_noIfDistKyes == 0, then each PK is dist key
ndb/src/ndbapi/NdbOperation.cpp:
NdbOperation::getTable
ndb/src/ndbapi/NdbOperationSearch.cpp:
remove d-key handling for pk ops
ndb/test/include/HugoCalculator.hpp:
remove unimpletemented methods
ndb/test/include/HugoOperations.hpp:
1) HugoOperation::setTransaction
2) Type independant value handling
3) Some more util methods
ndb/test/ndbapi/testPartitioning.cpp:
new testcase for validating startTransation with hint
ndb/test/run-test/atrt-mysql-test-run:
fix checks of return values
ndb/test/src/HugoCalculator.cpp:
Better generation of values
-- depends on fact that srand(K), rand() == srand(K), rand()
Generate string with base64
ndb/test/src/HugoOperations.cpp:
1) HugoOperation::setTransaction
2) Type independant value handling
3) Some more util methods
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Pre book fragments to keep count how many ops need to be continued by
api
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Pre book fragments to keep count how many ops need to be continued by
api
Fixes problem with parallelism < fragcount && committed read
ndb/test/ndbapi/testScan.cpp:
new testcase for scan parallelism
ndb/test/run-test/daily-basic-tests.txt:
Run new testcase
ndb/test/src/HugoTransactions.cpp:
Use parallelism parameter
1) Fix startTransaction with hint
2) Ship fragment data to API to make better guess
3) Expose both primary & backup replicas
To (in the future) be even more clever on choosing nodes for
transactions/operations
ndb/include/kernel/ndb_limits.h:
Set maxsize of array with fragment data
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Send fragment data to API
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
Send fragment data to API
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Send fragment data to API
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Send fragment data to API
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Use Uint16 for fragment info
Fix uninit variable
ndb/src/ndbapi/Ndb.cpp:
Impl. startTransaction with hint
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add interface for retreiving replica nodes given a hash-value
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Add interface for retreiving replica nodes given a hash-value
ndb/src/ndbapi/ndb_cluster_connection.cpp:
remove Fragment2NodeMap and put it on table instead
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
remove Fragment2NodeMap and put it on table instead
ndb/test/ndbapi/testNdbApi.cpp:
Test some more
mysql-test/r/ndb_alter_table.result:
wl-1442 new varchar
mysql-test/r/ndb_bitfield.result:
wl-1442 new varchar
mysql-test/r/ndb_charset.result:
wl-1442 new varchar
mysql-test/t/ndb_charset.test:
wl-1442 new varchar
ndb/include/kernel/signaldata/DictTabInfo.hpp:
wl-1442 new varchar
ndb/include/ndb_constants.h:
wl-1442 new varchar
ndb/include/ndbapi/NdbDictionary.hpp:
wl-1442 new varchar
ndb/include/util/NdbSqlUtil.hpp:
wl-1442 new varchar
ndb/src/common/util/NdbSqlUtil.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionary.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbOperationDefine.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbOperationSearch.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbRecAttr.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbTransaction.cpp:
wl-1442 new varchar
ndb/test/ndbapi/testOIBasic.cpp:
wl-1442 new varchar
sql/ha_ndbcluster.cc:
wl-1442 new varchar
added my_pthread_init to get dbug print correct in Hugo
added define for event error code
ndb/examples/ndbapi_event_example/ndbapi_event.cpp:
updated event example to make use of new NdbError member in NdbEventOperation
+ use define to check error code
ndb/include/kernel/signaldata/CreateEvnt.hpp:
updated create event signal to use define
ndb/include/ndbapi/NdbEventOperation.hpp:
added NdbError member to NdbEventOperation
ndb/include/ndbapi/ndberror.h:
added define for event error code
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
changed name of error code
ndb/src/ndbapi/NdbEventOperation.cpp:
added NdbError
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
added debug printout
added some error handling
ndb/src/ndbapi/NdbEventOperationImpl.hpp:
added NdbError
ndb/src/ndbapi/Ndberr.cpp:
added NdbError for NdbEventOperationImpl
ndb/src/ndbapi/ndberror.c:
changed some error codes
ndb/test/ndbapi/test_event.cpp:
added testcase for BUG#7627
ndb/test/src/HugoTransactions.cpp:
added printout in event
ndb/test/src/NDBT_Test.cpp:
added my_pthread_init to get dbug print correct
configure.in:
Auto merged
ndb/include/ndbapi/NdbApi.hpp:
Auto merged
ndb/include/ndbapi/NdbReceiver.hpp:
Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/Transporter.hpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
new constructor
ndb/test/ndbapi/flexHammer.cpp:
new constructor
ndb/test/ndbapi/flexTT.cpp:
new constructor
ndb/test/ndbapi/slow_select.cpp:
new constructor
ndb/test/ndbapi/testDeadlock.cpp:
new constructor
ndb/test/ndbapi/testLcp.cpp:
new constructor
configure.in:
Auto merged
client/mysqldump.c:
Auto merged
innobase/buf/buf0rea.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/fil0fil.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/grant_cache.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/timezone2.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_table.cc:
Auto merged
sql/strfunc.cc:
Auto merged
sql/unireg.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
