(re)impl. simple-read (read that releases lock just before LQHKEYCONF)
use simple-read for blobs
storage/ndb/include/kernel/signaldata/TcKeyConf.hpp:
rename bit
storage/ndb/include/ndbapi/NdbOperation.hpp:
add new lock-mode
storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp:
rename bit
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
remove aggregate
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
impl. simple-read = normal read + release lock just before LQHKEYCONF
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
impl. simple-read = normal read + release lock just before LQHKEYCONF
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
impl. simple-read = normal read + release lock just before LQHKEYCONF
storage/ndb/src/ndbapi/NdbBlob.cpp:
use simple read for blobs
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
no simple-read for ui (yet)
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
impl. simple-read
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
impl. simple-read
storage/ndb/src/ndbapi/NdbReceiver.cpp:
impl. simple-read
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
no simple-read for scan (yet)
storage/ndb/src/ndbapi/NdbTransaction.cpp:
rename bit
storage/ndb/test/ndbapi/testBasic.cpp:
add testcase for simlpe-read
storage/ndb/test/run-test/daily-basic-tests.txt:
add testcase
storage/ndb/test/src/HugoOperations.cpp:
add simple-read
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
Fix bug regarding node that missed 2 LCP's (that was not included in next LCP after SR)
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
add new error codes for bug#31525
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
add new error codes for bug#31525
fix bug, i.e include missing_2 in LCP
storage/ndb/test/ndbapi/testNodeRestart.cpp:
add testcase for bug#31525
storage/ndb/test/run-test/daily-basic-tests.txt:
add testcase for bug#31525
(autotest tests)
storage/ndb/test/ndbapi/testDict.cpp:
more test prg fixes
storage/ndb/test/ndbapi/testIndex.cpp:
more test prg fixes
storage/ndb/test/ndbapi/test_event.cpp:
more test prg fixes
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/cw/cpcd/APIService.cpp:
Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
merge
storage/ndb/test/ndbapi/testSystemRestart.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
storage/ndb/test/src/HugoTransactions.cpp:
merge
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
manual merge
storage/ndb/src/ndbapi/ndberror.c:
manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
manual merge
5.1 specific fixes so cluster will build on AIX (with IBM compiler)
config/ac-macros/ha_ndbcluster.m4:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1)
build NDB binaries as static on AIX. because that actually
*works*.
when building dynamic, with the IBM compiler (xlC_r), and
the build breaks on AIX due to missing symbols
(__vec__delete2 et al.), try adding -lhC to the Makefile.
storage/ndb/src/mgmclient/Makefile.am:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
fix path
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3)
__align is a keyword in xlC_r
storage/ndb/test/ndbapi/testIndexStat.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
gptr is now uchar*
template can't be static on xlC_r?
storage/ndb/test/ndbapi/test_event_merge.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
gptr is now uchar*
storage/ndb/test/run-test/main.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
gptr is now uchar*
storage/ndb/test/src/NDBT_Test.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
gptr is now uchar*
into sin.intern.azundris.com:/home/tnurnberg/10776/51-10776
include/mysql.h:
Auto merged
storage/ndb/src/mgmclient/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/benchronja.cpp:
Auto merged
storage/ndb/test/ndbapi/flexAsynch.cpp:
Auto merged
storage/ndb/test/ndbapi/flexHammer.cpp:
Auto merged
storage/ndb/test/ndbapi/flexScan.cpp:
Auto merged
storage/ndb/test/ndbapi/flexTT.cpp:
Auto merged
storage/ndb/test/ndbapi/flexTimedAsynch.cpp:
Auto merged
storage/ndb/test/ndbapi/initronja.cpp:
Auto merged
storage/ndb/test/ndbapi/testOperations.cpp:
Auto merged
storage/ndb/test/ndbapi/testScanFilter.cpp:
Auto merged
storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp:
Auto merged
configure.in:
manual merge
storage/ndb/src/common/util/File.cpp:
manual merge
storage/ndb/src/mgmsrv/Makefile.am:
manual merge
storage/ndb/test/ndbapi/testDict.cpp:
Added test for Bug#29501. Tested on both code without patch and code with patch. DN fails on code w/o and passed for code w/. Also includes new helper functions runWaitStarted and DropDDObjects. Along with these helper function I have included a test for DropDDObjects. I did find a case where lgman fails on the restarting DN with corrupt fs error. I will file a new bug report and test case for that.
storage/ndb/test/run-test/daily-basic-tests.txt:
Added new tests for bug29501
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
Fix case where all node in node group dies before they saved sysfile (wrt gcp)
and Qmgr incorrectly thinks that "node group is missing"
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
code
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
fix
storage/ndb/test/ndbapi/testSystemRestart.cpp:
test
storage/ndb/test/run-test/daily-basic-tests.txt:
test
Add test to testMgm for Connect timeout. add to autotest.
Index: ndb-work/storage/ndb/test/ndbapi/testMgm.cpp
===================================================================
storage/ndb/test/ndbapi/testMgm.cpp:
BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly
storage/ndb/test/run-test/daily-basic-tests.txt:
BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
storage/ndb/src/common/transporter/Packer.cpp:
Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
manual merge
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
manual merge
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
manual merge
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
manual merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
manual merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
merge
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/common/transporter/Packer.cpp:
Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
merge
set null bits on delete+insert
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
set null bits on delete+insert
storage/ndb/test/ndbapi/testBasic.cpp:
set null bits on delete+insert
20535
storage/ndb/test/run-test/daily-basic-tests.txt:
testcase
Fix DeleteRead in multi-operation
Dont use setup_read, as it will (correctly) find that tuple is deleted
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Fix multi-op DeleteRead
storage/ndb/test/ndbapi/testBasic.cpp:
Fix multi-op DeleteRead
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
into trift-lap.fambruehe:/MySQL/M51/push-5.1
mysql-test/Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysql_system_tables.sql:
Auto merged
scripts/mysql_system_tables_data.sql:
Auto merged
sql/item_subselect.h:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/test/ndbapi/testScanFilter.cpp:
Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
No need to propagate 5.0 changes into a 5.1 file which is deleted anyway.
Makefile.am:
Add "funcs_1" and "funcs_2" to the 5.1 version of the "test-bt" target.
storage/ndb/src/ndbapi/NdbImpl.hpp:
Manual merge from 5.0.40
into trift-lap.fambruehe:/MySQL/M51/push-5.1
configure.in:
Auto merged
include/Makefile.am:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
into ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
storage/ndb/test/include/HugoOperations.hpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/HugoOperations.cpp:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
SCCS merged
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/include/HugoOperations.hpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/HugoOperations.cpp:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Manual merge.
storage/ndb/test/ndbapi/testBasic.cpp:
Manual merge.
storage/ndb/test/ndbapi/testNdbApi.cpp:
Manual merge.
into ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Manual merge.
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
In a certain code path the NDBD could loop infinitely in the lock queue.
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fix infinite loop.
storage/ndb/test/include/HugoOperations.hpp:
Add optional hinting of TC for new transactions.
storage/ndb/test/ndbapi/testBasic.cpp:
Add test case.
storage/ndb/test/run-test/daily-basic-tests.txt:
Add test case.
storage/ndb/test/src/HugoOperations.cpp:
Add optional hinting of TC for new transactions.
