Add abort option to lots of Hugo code,
as it assumes it and default value has changed
storage/ndb/test/src/HugoTransactions.cpp:
Add abort option to lots of Hugo code,
as it assumes it and default value has changed
storage/ndb/test/src/UtilTransactions.cpp:
Add abort option to lots of Hugo code,
as it assumes it and default value has changed
- improve error message if starting wo/ enough REDO
- decrease likelyhood of trying to start too early
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
Add new error code (that maybe should have been there a looong time)
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Add new check (during SR) for that sufficient REDO is present
before continuing SR
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Add list of GCI's of nodes so that we can check for sufficient REDO during a SR
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Add check for REDO during SR
so that
1) cluster is not trying to start too soon
2) a better error message (than internal error) is provided if not enough REDO is present
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Add new error code (that maybe should have been there a looong time)
new behaviour is as follows:
1) node is refused to start, and should fail with message in error log that it must be restarted --initial
2) if cluster failure in this situation, node must also be restarted --intial
if not SR will fail, with this message
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Prevent node from starting _at all_ if it has performed more than 6 failed
node restart.
storage/ndb/test/ndbapi/testNodeRestart.cpp:
test prg 25984
storage/ndb/test/run-test/daily-basic-tests.txt:
testcase
into dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb
sql/log_event.cc:
Auto merged
sql/protocol.h:
Auto merged
sql/slave.cc:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/include/HugoOperations.hpp:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
storage/ndb/test/src/HugoOperations.cpp:
Auto merged
1) move AbortOption from NdbTransaction to NdbOperation
2) let each operation have a "default" abort option dependant on
operation type
- read - AO_IgnoreError
- dml - AbortOnError
- scan take over - AbortOnError
3) Changed default value to execute() from AbortOnError to DefaultAbortOption, which does not change the operations abort-option.
Another value to execute(AO) is equivalent to setting AO on each operation before calling execute
4) execute() does _only_ return -1 if transaction has been aborted
otherwise, you need to check each operation for error code
sql/ha_ndbcluster.cc:
adopt to changes in aption option handling
storage/ndb/include/ndbapi/NdbOperation.hpp:
Move "ownership" of AbortOption to operation from transaction
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Move "ownership" of AbortOption to operation from transaction
storage/ndb/src/ndbapi/NdbBlob.cpp:
Move "ownership" of AbortOption to operation from transaction
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
Move "ownership" of AbortOption to operation from transaction
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
Put default value on abortoption dependant on operation type
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
Move "ownership" of AbortOption to operation from transaction
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Move "ownership" of AbortOption to operation from transaction
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Move "ownership" of AbortOption to operation from transaction
storage/ndb/test/include/HugoOperations.hpp:
Move "ownership" of AbortOption to operation from transaction
storage/ndb/test/ndbapi/testNdbApi.cpp:
Move "ownership" of AbortOption to operation from transaction
storage/ndb/test/src/HugoOperations.cpp:
Move "ownership" of AbortOption to operation from transaction
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
- no injected events if operation is not connected
- remove extra valgrind checks
sql/ha_ndbcluster_binlog.cc:
removed extra valgrind check
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
valgrind leak
- no injected events if operation is not connected
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
add a judgement for arbitration rank configuration, if neither MGMD nor API nodes
are configured with rank = 0, show warning information;
correct indentations around patch;
two small fixes for TC
1) use static syntax
2) fix attlen handling in unique index
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
1) use static syntax
2) fix attlen handling in unique index
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
1) Two small windows cleanups for Archive.
2) Patch from Calvin for Falcon to be able to have its own I_S loaded. One example added for this, does hello world.
include/mysql/plugin.h:
Added new I_S type.
mysql-test/r/archive.result:
Fixed not dropped table.
mysql-test/t/archive.test:
Added additional drop table
sql/sql_plugin.cc:
Adding support in for the I_S.
sql/sql_show.cc:
Added schema type for plugin I_S. Additional loops were added to pop these on to the end of requests.
storage/archive/ha_archive.cc:
Windwos typo
mysql-test/r/archive.result:
Modified error output
mysql-test/t/archive.test:
Fix for the change in behavior
storage/archive/ha_archive.cc:
ifdef of the search record code
It also refactors the test case for Archive (removed two bad tests).
mysql-test/r/archive.result:
refactor archive test
mysql-test/t/archive.test:
Large refactoring of Archive test
storage/archive/ha_archive.cc:
Updated comments.
Added NULL packing hack
Fixed bug in wrong display of auto increment in show create table
into mysql.com:/home/gluh/MySQL/Merge/5.1
mysql-test/r/view.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
- added extra cluster connect inicator bit for better handeling of delacation of event operations on cluster disconnect
- added extra assert to try to track down valgrind issue
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/lock.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
mysql-test/r/myisam.result:
Manually merged.
mysql-test/t/myisam.test:
Manually merged.
Fixes autodiscovery of tables.
Allows the FRM to be extracted from the ARZ file via archive_reader.
storage/archive/archive_reader.c:
Extract FRM command added.
We now print the embedded comment
storage/archive/archive_test.c:
Additional tests for FRM annd comment
storage/archive/azio.c:
Filled in functionality for comment and frm.
storage/archive/azlib.h:
Refactored position.
storage/archive/ha_archive.cc:
Discovery mechanism filled in.
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
BitKeeper/etc/ignore:
auto-union
mysql-test/r/func_in.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
mysql-test/t/range.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/select.result:
manual merge
mysql-test/r/view.result:
manual merge
mysql-test/t/select.test:
manual merge
mysql-test/t/view.test:
manual merge
Fix read after delete (in same op)
- lqh, handling of attrinfo
- tup, setup read for disk/varchar
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Dont save ATTRINFO "also" for DELETE, even when getting it in separate signal
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Add disk flag to signature
(for read after delete)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Do setup read before read after delete
storage/ndb/test/ndbapi/testBasic.cpp:
testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
testcase
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/util/SocketClient.hpp:
Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
Auto merged
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Auto merged
storage/ndb/include/portlib/NdbMem.h:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
mysql-test/r/ndb_basic.result:
manual merge
mysql-test/t/ndb_basic.test:
manual merge
storage/ndb/src/ndbapi/ndberror.c:
manual merge
- add some sanity check to marker/hash code to see that element isnt inserted twice into hashtable
(if defined VM_TRACE or ERROR_INSERT)
- allow REMOVE_MARKER_ORD to fail(dont find record) in release
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
add a bunch of sanity check ifdef#vmtrace of #error_insert
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
add a bunch of sanity check ifdef#vmtrace of #error_insert
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
Auto merged
