into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/vm/RequestTracker.hpp:
Auto merged
storage/ndb/src/kernel/vm/SafeCounter.hpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
have to push this to be able to push 5.0
storage/ndb/include/kernel/signaldata/DictLock.hpp:
Rename: ndb/include/kernel/signaldata/DictLock.hpp -> storage/ndb/include/kernel/signaldata/DictLock.hpp
storage/ndb/src/kernel/blocks/dbdict/DictLock.txt:
Rename: ndb/src/kernel/blocks/dbdict/DictLock.txt -> storage/ndb/src/kernel/blocks/dbdict/DictLock.txt
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
debug
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/src/ndbapi/ndberror.c:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/test/ndbapi/testDict.cpp:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/test/src/NdbRestarter.cpp:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
no DD when diskless
storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp:
New error code for create file when diskless
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
New error code for create file when diskless
storage/ndb/src/ndbapi/ndberror.c:
New error code for create file when diskless
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
create tablespace/logfile group should "back out changes"
mysql-test/r/ndb_dd_ddl.result:
add testcase for bug#16341
mysql-test/t/ndb_dd_ddl.test:
add testcase for bug#16341
sql/ha_ndbcluster.cc:
If create data/undo file fails, check if filegroup is same version, and if it is drop it (wo/ checking error)
storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp:
add version to createfileconf
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
add version to createfileconf
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)
storage/ndb/test/ndbapi/test_event_merge.cpp:
test multiple tables and getGCIEventOperations
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
fix getGCIEventOperations when merge events is on
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
fix getGCIEventOperations when merge events is on
make sure tablename is release in case of alter table
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
make sure tablename is release in case of alter table
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
varpages did not get freed on drop table
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Add continueb for freeing varpages
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Add continueb for freeing varpages
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
add dropping of varpages
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
Add continueb for freeing varpages
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
Add list of varpage chunks
storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp:
Add list of varpage chunks
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
manual merge
into mysql.com:/home/stewart/Documents/MySQL/5.1/main
storage/ndb/include/util/ConfigValues.hpp:
Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
manual merge (n/a in 5.1)
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
storage/ndb/src/ndbapi/NdbBlob.cpp:
SCCS merged
storage/ndb/src/ndbapi/ndberror.c:
use local
into mysql.com:/home/stewart/Documents/MySQL/5.1/main
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
Auto merged
into zim.(none):/home/brian/mysql/cleanup-5.1
BitKeeper/deleted/.del-partition_innodb.result:
Delete: mysql-test/r/partition_innodb.result
BitKeeper/deleted/.del-partition_innodb.test:
Delete: mysql-test/t/partition_innodb.test
include/config-win.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
include/my_sys.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
Reproduced failure of NFMaster on my laptop, this is the fix with some added
debug information to help people in the future when they trigger asserts in
AsyncFile (ndbfs helper threads).
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
In Backup::checkFile(Signal*, BackupFilePtr), only send FSCLOSEREQ if file
is not already being closed.
Add debug printouts if DEBUG_ABORT is defined to help in finding the problem.
Only set filePtr.p->fileClosing when we are actually closing the file, not when
we're anticipating a close.
In Backup::closeFiles(Signal*,BackupRecordPtr), when we're closing a file,
make sure we've queued everything to be written out before sending FSCLOSEREQ.
This solves two problems:
- in testBackup (NFMaster) on my machine (but not in autotest since the end of
March for whatever reason), we were hitting an assert in the buffer for files
saying we hadn't written everything out of the buffer before closing. (for the
interested, it was 10 bytes of data)
- once I'd fixed the above (by the checkFile before close) I'd then get really
nonsensical trace dumps in NFMaster for ERROR_INSERT 10003. It turns out that
any asserts in AsyncFile (the thread that NDBFS runs to do its bidding) don't
cause anything to be written out anywhere and you're left scratching your head
as to what on earth happenned (apart from getting "caught signal 6, aborted").
What really was happenning was we were then calling FSCLOSEREQ one too many times,
hitting the assert on trying to close an fd of -1 in AsyncFile.
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
It turns out that any asserts in AsyncFile (the thread that NDBFS runs to do
its bidding) don't cause anything to be written out anywhere and you're left
scratching your head as to what on earth happenned (apart from getting
"caught signal 6, aborted"). What really was happenning was we were then
calling FSCLOSEREQ one too many times, hitting the assert on trying to close
an fd of -1 in AsyncFile.
Added DEBUG printouts for every assert in AsyncFile
storage/ndb/test/ndbapi/test_event.cpp:
test applier under merge events
also fix run in 5.1 (check for data event)
storage/ndb/test/run-test/daily-devel-tests.txt:
add: test_event -n MergeEventOperationApplier_NR
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
allow idempotency INSoINS or DELoDEL
does NOT check data section 2 (before data)
into mysql.com:/home/marty/MySQL/mysql-5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
Many files:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
ndb_lock.result, ha_ndbcluster.cc:
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
NdbDictionaryImpl.hpp:
Fix of bad merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Fix of bad merge
sql/ha_ndbcluster.cc:
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
mysql-test/r/ndb_lock.result:
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
sql/ha_ndbcluster_binlog.cc:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
mysql-test/r/rpl_ndb_basic.result:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
mysql-test/t/rpl_ndb_basic.test:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
sql/ha_ndbcluster_binlog.h:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
sql/sql_delete.cc:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
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/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
into mysql.com:/home/marty/MySQL/mysql-5.1
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
mysql-test/r/ndb_lock.result:
Merge
sql/ha_ndbcluster.cc:
Merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Merge
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Merge
storage/ndb/src/ndbapi/ndberror.c:
Merge
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
BUILD/compile-dist:
Auto merged
client/mysqltest.c:
Auto merged
config/ac-macros/ssl.m4:
Auto merged
include/config-win.h:
Auto merged
include/my_base.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/group_min_max.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/rpl_insert_id_pk.result:
Auto merged
mysql-test/r/rpl_ndb_multi_update3.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/r/rpl_ndb_sp006.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysys/my_clock.c:
Auto merged
mysys/my_copy.c:
Auto merged
mysys/my_create.c:
Auto merged
mysys/my_dup.c:
Auto merged
mysys/my_lib.c:
Auto merged
mysys/my_open.c:
Auto merged
mysys/my_redel.c:
Auto merged
mysql-test/r/create.result:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/r/join_outer.result:
Manual merge
mysql-test/t/func_group.test:
Manual merge
mysql-test/t/group_min_max.test:
Manual merge
mysql-test/t/innodb_mysql.test:
Manual merge
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
- check node type, if configuration has not bee updated, type will be undefined, and conenction will be refused
storage/ndb/include/kernel/signaldata/AllocNodeId.hpp:
Bug #13266 Online adding of MySQLD causes cluster to crash
- propagate node type on allocation
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Bug #13266 Online adding of MySQLD causes cluster to crash
- propagate node type on allocation
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Bug #13266 Online adding of MySQLD causes cluster to crash
- propagate node type on allocation
storage/ndb/src/ndbapi/ndberror.c:
Bug #13266 Online adding of MySQLD causes cluster to crash
- propagate node type on allocation
Make sure that error gets set corretly also
when error code directly after taking mutex
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Make sure that error gets set corretly also
when error code directly after taking mutex
impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases
storage/ndb/src/ndbapi/ClusterMgr.cpp:
impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases
storage/ndb/test/src/NDBT_Test.cpp:
impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases
storage/ndb/include/util/SocketServer.hpp:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
