Handle events "differently" so that dict doesnt get lock too often
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/vm/KeyTable2.hpp:
Handle event separatly as they dont set block_state :-(
fixes to testprogram to test new impl. in 5.1
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
move tsman dumps
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
add more support for connection handling using dumps
storage/ndb/test/ndbapi/testNodeRestart.cpp:
port testprogram to 5.1 to avoid "extra" safety net in LQH
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
5.1 version
remove 5.0 version
add general routing signal
send tckeyref routed if needed...
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Add general routing signal
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
Add general routing signal
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
send TCKEYREF routed if needed
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
add general routing
remove node started state
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
add general routing
remove node started state
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
add general routing
remove node started state
remove "avoid sending committed read to early" as it now should be handled correctly
storage/ndb/include/kernel/signaldata/RouteOrd.hpp:
New BitKeeper file ``storage/ndb/include/kernel/signaldata/RouteOrd.hpp''
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/common/util/NdbSqlUtil.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
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/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.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/cmvmi/Cmvmi.cpp:
merge
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
merge
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
merge
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
merge
storage/ndb/src/ndbapi/ndberror.c:
merge
Fix typo that yeilded rare crash in ACC
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
fix typo, where elementptr was sent as elementheader
yeilded very rare crashes as only 1 bit is checked
and it's only checked under certatin rare circumstances
Handle not started nodes correctly (for X restart)
i.e dont wait for NF_COMPLETEREP
but settle with NODEFAIL_REP
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Handle not started nodes correctly
i.e dont wait for NF_COMPLETEREP
but settle with NODEFAIL_REP
fix so backup message is printed even in case of "ndb_mgm -e"
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
fix backup printer
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Fix so that backup message is printed even if "ndb_mgm -e"
storage/ndb/src/ndbapi/SignalSender.cpp:
move method into TransporterFacade to enable API_TRACE
storage/ndb/src/ndbapi/TransporterFacade.cpp:
move method into TransporterFacade to enable API_TRACE
Resend if master dies during alloc node id
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Add new error code
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Add new error code
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Make sure to resend if master died
storage/ndb/test/ndbapi/testNodeRestart.cpp:
add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
add testcase
1) Make sure not to read uninitialized data in unique index code
harmless (atleast before dynattr)
2) Dont update p_latest_trans_gci
for dirty unique index lookup
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
Make sure not to read uninitialized data in unique index code
harmless (atleast before dynattr)
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Dont update p_latest_trans_gci
for dirty unique index lookup
Make sure LCP scan record is correct initialized
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Init ScanOp
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
And set correct pointers...
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/ndbapi/testScan.cpp:
merge
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/common/util/socket_io.cpp:
Auto merged
storage/ndb/src/common/util/InputStream.cpp:
merge
Make sure index scan does not commitDelete
mysql-test/r/ndb_index_ordered.result:
testcase
mysql-test/t/ndb_index_ordered.test:
testcase
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Make sure index scan does not commitDelete
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/common/util/socket_io.cpp:
merge
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
storage/ndb/src/mgmsrv/Services.cpp:
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/kernel/ndb_limits.h:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
merge
and use it for testOperations/testTransactions
storage/ndb/test/include/NDBT_Test.hpp:
Add support for temporary tables in hugo
storage/ndb/test/ndbapi/testOperations.cpp:
Make testOperations use temporary tables
storage/ndb/test/ndbapi/testTransactions.cpp:
Make testTransactions use temporary tables
storage/ndb/test/src/NDBT_Tables.cpp:
Add support for temporary tables in hugo
storage/ndb/test/src/NDBT_Test.cpp:
Add support for temporary tables in hugo
fix another incorrect assertion
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
clear m_transaction_nodes.clear()
to avoid asserion in debug-compiled in releaseApiCon
Dont assert when getting gci=0 in read only transaction
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Dont assert when getting gci=0 in read only transaction
make sure not to release log buffer twice (or several times) in case of abort of multi update
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
make sure not to release log buffer twice (or several times) in case of abort of multi update
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
BitKeeper/deleted/.del-ha_berkeley.cc:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
storage/blackhole/ha_blackhole.h:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/csv/ha_tina.h:
Auto merged
storage/example/ha_example.cc:
Auto merged
storage/example/ha_example.h:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/federated/ha_federated.h:
Auto merged
storage/heap/ha_heap.cc:
Auto merged
storage/heap/ha_heap.h:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/main.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
merge
sql/ha_ndbcluster.h:
merge
sql/handler.h:
merge
sql/sql_delete.cc:
merge
storage/archive/ha_archive.h:
merge
storage/innobase/handler/ha_innodb.cc:
merge
storage/innobase/handler/ha_innodb.h:
merge
storage/myisam/ha_myisam.cc:
merge
storage/myisammrg/ha_myisammrg.h:
merge
Early abort, failing to allocate buffers, would go down the abort track and
end up trying to sendDropTriggers (as the standard stop backup does).
However, it is possible to not have any tables yet defined in the backup
(due to allocating buffers is before this). Simple check in sendDropTrig
(and continue to next step). Files may be open, so we continue to close them.
Also updated ERROR_Codes (and added one to test this bug).
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
update BACKUP error insert codes to reflect current reality.
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Allow for early abort when no tables have been included in backup.
Allow for abort when file records have been seized but not yet allocated
to specific uses (is the case when buffer allocation fails)
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
initialize BackupRecord file Ptrs
storage/ndb/test/src/NdbBackup.cpp:
Add extra failure codes for buffer allocation failure in backup
config/ac-macros/ha_ndbcluster.m4:
re-introduce NDB_SIZEOF substitutions to prevent NdbApi depending on my_config
which causes problems for autotools enabled ndbapi programs
storage/ndb/include/ndb_types.h.in:
remove dependency on my_config.h that was causing problems for ndbapi programs
using autoconf
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
merge
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
merge
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
include/my_sys.h:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb_restore Return OK even if temporary errors
(otherwise mysql-test-run/ndb_restore can fail on really slow machines)
storage/ndb/tools/restore/restore_main.cpp:
Return OK even if temporary errors