into trift-lap.fambruehe:/MySQL/M50/push-5.0
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
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Manual merge: Use the symbolic constant.
ndb/test/ndbapi/testScanFilter.cpp:
Manual merge: Use the standard text.
into ymer.(none):/usr/local/mysql/mysql-5.0-ndb
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Manual merge.
into ymer.(none):/usr/local/mysql/mysql-5.0-ndb
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
NdbTransaction::executeAsynch() was not implemented. Add implementation.
ndb/include/ndbapi/NdbTransaction.hpp:
executeAsynch() should probably allow setting forceSend.
ndb/src/ndbapi/NdbTransaction.cpp:
Add missing implementation of executeAsynch().
ndb/test/ndbapi/testNdbApi.cpp:
Add test case.
ndb/test/run-test/daily-basic-tests.txt:
Add new test.
The old blob implementation had code that attempted to upgrade the lock mode for
LM_CommittedRead operations, but it did not work properly as it did not recompute
the operation flags.
As a consequence, reading a blob with LM_CommittedRead could return inconsistent
data, with different part of the read data being from different commits done by
other transactions.
The fix is to correctly recompute all necessary flags when upgrading lock mode.
ndb/include/kernel/signaldata/ScanTab.hpp:
Remove assumption in setXXX() methods that old value is zero, needed to allow blob
code to upgrade lock mode.
Fix spelling and commments.
ndb/include/ndbapi/NdbOperation.hpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/include/ndbapi/NdbScanOperation.hpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/src/ndbapi/NdbBlob.cpp:
Fix upgrading lock mode (old code had no effect).
ndb/src/ndbapi/NdbOperationDefine.cpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/src/ndbapi/NdbScanOperation.cpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/test/ndbapi/testBlobs.cpp:
Add testcase.
ndb/test/run-test/daily-basic-tests.txt:
Enable bug tests for auto test.
Bug #27710 Creating unique index fails during single user mode
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Bug #27710 Creating unique index fails during single user mode
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
- parse indexname using "split" instead of sscanf, as not to break at space
- test case with space in key
- enclose names in printout
mysql-test/r/ndb_restore.result:
Bug #27758 Restoring NDB backups makes table usable in SQL nodes
- change to using an index with space to reproduce bug
mysql-test/t/ndb_restore.test:
Bug #27758 Restoring NDB backups makes table usable in SQL nodes
- change to using an index with space to reproduce bug
ndb/tools/restore/consumer_restore.cpp:
Bug #27758 Restoring NDB backups makes table usable in SQL nodes
- parse indexname using "split" instead of sscanf, as not to break at space
- enclose names in printout
ndb/tools/restore/restore_main.cpp:
Bug #27758 Restoring NDB backups makes table usable in SQL nodes
- enclose names in printout
sql/ha_ndbcluster.cc:
Bug #27758 Restoring NDB backups makes table usable in SQL nodes
- correct error message
- try to catch as many malloc failures as possible and give error messages
ndb/src/ndbapi/ObjectMap.cpp:
New BitKeeper file ``ndb/src/ndbapi/ObjectMap.cpp''
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
make sure not to leave partially initialized pagerage-records
ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
make sure not to leave partially initialized pagerage-records
correct cit printout
correct bit store retrieve
ndb/include/ndbapi/NdbRecAttr.hpp:
correct medium int printout
ndb/src/ndbapi/NdbRecAttr.cpp:
correct cit printout
sql/ha_ndbcluster.cc:
correct bit store retrieve
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
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/include/kernel/signaldata/DictTabInfo.hpp:
manual merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
manual merge
ndb/include/kernel/signaldata/DictTabInfo.hpp:
add single user mode field in table definition
ndb/include/ndb_constants.h:
new constants for single usermode option of tables
ndb/include/ndbapi/NdbDictionary.hpp:
add single user mode field in table definition
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
add single user mode field in table definition
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
add single user mode field in table definition
send this infor to TC
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
add single user mode field in table definition
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
single user table mode on table object
merge some flags from uint8 to bits
get allow transaction to also check single user mode
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
single user table mode on table object
merge some flags from uint8 to bits
get allow transaction to also check single user mode
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
set single user mode flag on system tables to make them always updatable
ndb/src/ndbapi/NdbDictionary.cpp:
get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
get/set functions for single user mode on tables
ndb/test/src/NDBT_Table.cpp:
print single user mode
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
Additional fix for 2-node case
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Add error insert ref for errcode = 7181
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
proper fix exists only in version >= 5.1
mysql-test/r/ndb_blob.result:
bug#24028 in 5.0 only
mysql-test/t/ndb_blob.test:
bug#24028 in 5.0 only
ndb/src/ndbapi/NdbBlob.cpp:
bug#24028 in 5.0 only
ndb/test/ndbapi/testBlobs.cpp:
bug#24028 in 5.0 only
