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
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
ndb/test/run-test/Makefile.am:
Auto merged
sql/item.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
innobase/row/row0mysql.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.h:
Auto merged
vio/viosocket.c:
Auto merged
scripts/mysql_create_system_tables.sh:
simple merge
sql/field.cc:
simple merge
sql/item.h:
simple merge
sql/sql_lex.h:
simple merge
sql/sql_yacc.yy:
Merge
(join_table_list was not comptely merged. Need to run test to know how things works...)
sql/table.cc:
Keep code from 5.0, except delted one not needed line
strings/ctype-ucs2.c:
Auto merge
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/test/run-test/daily-basic-tests.txt:
run mysql-test-run for max 1 hour
(normally 30 minutes)
ndb/test/run-test/daily-devel-tests.txt:
Add benchmark to devel suite
ndb/test/run-test/main.cpp:
Add bench mode. always produce report
ndb/test/run-test/run-test.hpp:
Add bench mode. always produce report
increased timeout as it is exceeded every now and then giving erroneous indication on error
ndb/test/run-test/daily-basic-tests.txt:
increased timeout as it is exceeded every now and then giving erroneous indication on error
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
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
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
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
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
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/util/Makefile.am:
Auto merged
ndb/src/kernel/blocks/backup/Backup.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/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/tools/Makefile.am:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
