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/50-work
ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testScan.cpp:
merge
ndb/test/run-test/daily-basic-tests.txt:
merge
api disconnect just after SCAN_TABREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
1) add error insert for faking DISCONNECT of API just after SCAN_TABREQ
2) handle error :-)
ndb/test/ndbapi/testScan.cpp:
Add etstcase for bug 24447
ndb/test/run-test/daily-basic-tests.txt:
Add etstcase for bug 24447
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
Fix bug wrt to '\r' handling in latest commit to bug#24011
ndb/src/common/util/InputStream.cpp:
Fix bug wrt to '\r' handling in latest commit to bug#24011
ndb/src/common/util/socket_io.cpp:
Fix bug wrt to '\r' handling in latest commit to bug#24011
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
Still leakage, make sure all unlinked operations are put back so they will be release
(on failing blob operations, when AO_IgnoreError)
ndb/src/ndbapi/NdbConnection.cpp:
Still leakage, make sure all unlinked operations are put back so they will be release
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
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/include/kernel/ndb_limits.h:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
SCCS merged
Fix some too small buffers in backup
ndb/include/kernel/ndb_limits.h:
backport for 5.1
add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE
ndb/src/kernel/blocks/backup/Backup.cpp:
Make sure to set maxInsert so that we actually can handle NO_OF_META_PAGES
ndb/src/kernel/blocks/backup/Backup.hpp:
backport for 5.1
add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE
when doing create unique index which mysql will silently converts to PK, ndb is not informed
so table will be useless.
change so that we never do online add index wo/ primary key.
this is not good, but it's better than a useless table
Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
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
this changes lock taken during peek, to decrease likelyhood of transaction abort
sql/ha_ndbcluster.cc:
use exclusive lock in peek, as peek is used just before insert/update
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
Make sure postExecute is not run for blobs if AO_IgnoreError
ndb/src/ndbapi/NdbConnection.cpp:
If AO_IgnoreError, error codes arent always set on individual operations, making postExecute impossible
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
update partition engine for handler::info returning int
sql/ha_partition.cc:
update for handler::info returning int.
sql/ha_partition.h:
update for handler::info returning int.
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
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-is_files_refactor
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_show.cc:
Auto merged
into dator5.(none):/home/pappa/bug18198
mysql-test/r/partition.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/item_func.h:
Auto merged
sql/partition_info.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_partition.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item_cmpfunc.h:
e
mysql-test/r/ndb_basic.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/r/ndb_blob.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/r/ndb_charset.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/r/ndb_condition_pushdown.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/r/ndb_dd_sql_features.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/r/ndb_subquery.result:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_basic.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_blob.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_charset.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_condition_pushdown.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_dd_sql_features.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
mysql-test/t/ndb_subquery.test:
replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
