summaryrefslogtreecommitdiff
path: root/ndb/test/ndbapi
Commit message (Collapse)AuthorAgeFilesLines
* ndb - post merge fixunknown2005-12-271-1286/+0
| | | | | | | storage/ndb/test/ndbapi/test_event_merge.cpp: Rename: ndb/test/ndbapi/test_event_merge.cpp -> storage/ndb/test/ndbapi/test_event_merge.cpp storage/ndb/test/ndbapi/Makefile.am: post-merge fix
* Merge mysql.com:/space/pekka/ndb/version/my50unknown2005-12-271-0/+1286
|\ | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51 storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: merge-ul storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: merge-ul storage/ndb/test/ndbapi/Makefile.am: merge-ul
| * ndb - wl#2972 (5.0) fix detached trigger opType + new pgm test_event_mergeunknown2005-12-272-1/+1290
| | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/NdbEventOperationImpl.cpp: error code 4709 was set outside if() ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: fix opType for detached triggers (accidental miss since v21x?) ndb/test/ndbapi/Makefile.am: test_event_merge v5.0 ndb/test/ndbapi/test_event_merge.cpp: test_event_merge v5.0
| * Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-12-131-0/+149
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/test/ndbapi/testNodeRestart.cpp: Auto merged ndb/src/kernel/blocks/ERROR_codes.txt: merge ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: merge ndb/test/run-test/daily-basic-tests.txt: merge
| | * ndb - bug#15685unknown2005-12-121-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error in abort handling in TC when timeout during abort ndb/src/kernel/blocks/ERROR_codes.txt: New error codes ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: New error codes ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Dont release transaction record to early ndb/test/ndbapi/testNodeRestart.cpp: Test case ndb/test/run-test/daily-basic-tests.txt: Test case
| | * bug#15632 - ndbunknown2005-12-091-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes ndb/include/ndb_version.h.in: Handle upgrade of bug fix ndb/src/kernel/blocks/ERROR_codes.txt: New error code for delaying INCL_NODE_REQ ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes ndb/test/ndbapi/testNodeRestart.cpp: Add testcase for bug#15632
| | * bug#15587 - ndbunknown2005-12-081-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error in NF during NR ndb/include/kernel/signaldata/DumpStateOrd.hpp: Add dump for ERROR 5002 with specified table ndb/src/kernel/blocks/ERROR_codes.txt: Add dump for ERROR 5002 with specified table ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Run updateNodeInfo if failed node is not in list of storedReplicas ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Add dump for ERROR 5002 with specified table ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Add dump for ERROR 5002 with specified table ndb/test/ndbapi/testNodeRestart.cpp: Add testcase for bug#15587 ndb/test/run-test/daily-basic-tests.txt: Add testcase for bug#15587
| * | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-10-171-0/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
| | * ndb - hugounknown2005-10-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Disable tests of lock upgrade paths that are currently unsupported ndb/test/ndbapi/testOperations.cpp: Disable lock upgrade paths that currently unsupported
| | * ndb unknown2005-09-162-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove extra ";" from test programs ndb/test/include/NDBT_Test.hpp: Remove extra ";" ndb/test/ndbapi/bank/BankLoad.cpp: Remove extra ";" ndb/test/ndbapi/testOIBasic.cpp: Remove extra ";" ndb/test/src/HugoCalculator.cpp: Remove extra ";" ndb/test/src/NDBT_Test.cpp: Remove extra ";" ndb/test/src/NdbBackup.cpp: Remove extra ";" ndb/test/src/NdbRestarts.cpp: Remove extra ";"
| * | ndb - ndbapi testprogram bugfixunknown2005-10-171-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | testBackup, fix assertion ndb/test/ndbapi/testBackup.cpp: Fetch table before verifying
* | | 5.0->5.1 merge fixunknown2005-09-091-246/+0
| | | | | | | | | | | | | | | | | | | | | | | | 5.1 has moved ndb into storage storage/ndb/test/ndbapi/testSRBank.cpp: Rename: ndb/test/ndbapi/testSRBank.cpp -> storage/ndb/test/ndbapi/testSRBank.cpp
* | | Merge eel.(none):/home/jonas/src/mysql-5.0unknown2005-09-091-0/+246
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-5.1-push sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_show.cc: Auto merged storage/ndb/src/common/portlib/NdbThread.c: Auto merged storage/ndb/test/include/NDBT_Test.hpp: Auto merged storage/ndb/test/ndbapi/Makefile.am: Auto merged storage/ndb/test/ndbapi/bank/Bank.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.hpp: Auto merged storage/ndb/test/src/NDBT_Test.cpp: Auto merged storage/ndb/test/src/UtilTransactions.cpp: Auto merged
| * | merge fixesunknown2005-09-091-7/+7
| | |
| * | Merge eel.(none):/home/jonas/src/mysql-4.1unknown2005-09-094-84/+337
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-5.0 BitKeeper/etc/ignore: auto-union ndb/test/include/NDBT_Test.hpp: Auto merged ndb/test/src/NDBT_Test.cpp: Auto merged ndb/test/ndbapi/Makefile.am: merge ndb/test/ndbapi/bank/Bank.cpp: merge ndb/test/ndbapi/bank/Bank.hpp: merge ndb/test/src/UtilTransactions.cpp: merge
| | * ndb unknown2005-09-094-84/+337
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new testprogram testSRBank BitKeeper/etc/ignore: Added ndb/test/ndbapi/testSRBank to the ignore list ndb/test/include/NDBT_Test.hpp: incProperty ndb/test/ndbapi/Makefile.am: new test program ndb/test/ndbapi/bank/Bank.cpp: remove endless wait until ready loop fix lots of retry loops to better handle error ndb/test/ndbapi/bank/Bank.hpp: remove endless wait until ready loop fix lots of retry loops to better handle error ndb/test/src/NDBT_Test.cpp: incProperty ndb/test/src/UtilTransactions.cpp: close transaction if failed ndb/test/ndbapi/testSRBank.cpp: New BitKeeper file ``ndb/test/ndbapi/testSRBank.cpp''
| * | Merge mishka.local:/home/my/mysql-4.1unknown2005-08-251-540/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mishka.local:/home/my/mysql-5.0 BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667: Auto merged BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387: Auto merged BitKeeper/deleted/.del-ctype_cp932.result: Auto merged BitKeeper/deleted/.del-ctype_cp932.test: Auto merged BitKeeper/deleted/.del-have_lowercase0.inc: Delete: mysql-test/include/have_lowercase0.inc VC++Files/mysql-test/mysql_test_run_new.dsp: Auto merged configure.in: Auto merged mysql-test/include/ps_conv.inc: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/ha_innodb.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/examples/ha_archive.cc: Auto merged sql/examples/ha_example.cc: Auto merged sql/sql_table.cc: Auto merged support-files/mysql.spec.sh: Auto merged VC++Files/client/mysqltest.dsp: manual merge VC++Files/sql/mysqld.dsp: manual merge mysql-test/r/grant2.result: patch merge mysql-test/r/subselect2.result: manual merge mysql-test/t/grant2.test: patch merge mysys/charset.c: Remove already deleted function sql/examples/ha_archive.h: Manual merge sql/sql_acl.cc: manual merge sql/sql_db.cc: merge (no differences) sql/sql_select.cc: manual merge sql/table.h: merge (no differences) tests/mysql_client_test.c: patch merge
| | * removed ndb grep from configure .inunknown2005-08-231-540/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0: Delete: ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667: Delete: ndb/src/kernel/blocks/grep/Grep.cpp BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc: Delete: ndb/src/kernel/blocks/grep/Makefile.am BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387: Delete: ndb/src/kernel/blocks/grep/Grep.hpp BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd: Delete: ndb/src/kernel/blocks/grep/GrepInit.cpp BitKeeper/deleted/.del-Makefile~b293ae88e4394490: Delete: ndb/src/kernel/blocks/grep/systab_test/Makefile BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62: Delete: ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5: Delete: ndb/test/ndbapi/testGrep.cpp
| * | bug#11133 - ndb write/lock upgradeunknown2005-07-221-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix test case improve testing ndb/test/include/HugoOperations.hpp: Partial write (only pk) ndb/test/ndbapi/testNdbApi.cpp: improve testcase use writePartial to verify that ops get correctly converted (also test negative) ndb/test/src/HugoOperations.cpp: write partial + improve prinout in wait_async
| * | mergeunknown2005-07-211-2/+2
| | |
| * | mergeunknown2005-07-201-1/+1
| | |
| * | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2005-07-202-221/+134
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0 ndb/include/kernel/signaldata/DictTabInfo.hpp: Auto merged ndb/include/ndbapi/NdbDictionary.hpp: Auto merged ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged ndb/test/ndbapi/testBackup.cpp: Auto merged ndb/test/ndbapi/testNdbApi.cpp: Auto merged ndb/test/run-test/daily-basic-tests.txt: Auto merged ndb/tools/drop_index.cpp: Auto merged ndb/tools/listTables.cpp: Auto merged ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: merge ndb/src/ndbapi/ndberror.c: merge ndb/test/include/HugoOperations.hpp: merge ndb/test/src/HugoOperations.cpp: merge
| | * bug#11942unknown2005-07-201-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/kernel/signaldata/AlterTable.hpp: Add error code for backup in progress ndb/include/kernel/signaldata/DictTabInfo.hpp: Add backup state ndb/include/kernel/signaldata/DropTable.hpp: Add error code for backup in progress ndb/include/ndbapi/NdbDictionary.hpp: Add backup state ndb/src/kernel/blocks/backup/Backup.cpp: 1) remove invalid require (util_sequence_ref) crash 2) Don't backup objects dropping/creating 3) set correct error code on backup fragment ref (crash) 4) save TrigAttrInfo header when getting log full (crash) 5) lock/unlock tables during backup ndb/src/kernel/blocks/dbdict/Dbdict.cpp: 1) add mutex lock/unlock as part of drop/alter table 2) add lock/unlock for backup 3) remove TC from backup trigger loop ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Add BACKUP_ONGOING state ndb/src/ndbapi/NdbDictionaryImpl.cpp: Add backup state ndb/src/ndbapi/ndberror.c: Add error code for backup in progress ndb/test/ndbapi/testBackup.cpp: Add testcase for testBackup -n BackupDDL ndb/tools/drop_index.cpp: Fix ndb_drop_index ndb/tools/listTables.cpp: Print of backup state
| | * bug#11133 - ndb write handlingunknown2005-07-011-221/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix handling of write's in lock queue add test case add support for pkWrite+async exec in HugoOperations ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Handle operation type wrt ZWRITE when restarting operations ndb/test/include/HugoOperations.hpp: Add support for 1) pkWriteRecord 2) async execute ndb/test/ndbapi/testNdbApi.cpp: Extend test case for bug#11133 with multi transaction tests aswell... ndb/test/src/HugoOperations.cpp: Add support for 1) pkWriteRecord 2) async execute
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-06-211-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1 client/mysqltest.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/ha_ndbcluster.cc: Auto merged
| | | * Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-06-201-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug10365 sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_table.cc: Auto merged
| | | | * BUG#10365 Cluster handler uses non-standard error codesunknown2005-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added better error messages when trying to open a table that can't be discovered or unpacked. The most likely cause of this is that it does not have any frm data, probably since it has been created from NdbApi or is a NDB system table. - Separated functionality that was in ha_create_table_from_engine into two functions. One that checks if the table exists and another one that tries to create the table from the engine. mysql-test/r/ndb_autodiscover.result: Add tests for reading from a table that can't be discovered(SYSTAB_0) Discovery is not performed during create table anymore. mysql-test/t/ndb_autodiscover.test: Add tests for reading from a table that can't be discovered(SYSTAB_0) Discovery is not performed during create table anymore. ndb/test/ndbapi/create_tab.cpp: Set connectstring before creating Ndb object. sql/ha_ndbcluster.cc: Rename and use the function ndbcluster_table_exists_in_engine. Correct return valu from ndbcluster_discover Remove old code "ndb_discover_tables" sql/ha_ndbcluster.h: Rename function ndbcluster_table_exists to ndb ndbcluster_table_exists_in_engine sql/handler.cc: Update comment of ha_create_table_from_engine Remove parameter create_if_found from ha_create_table_from_engine, the function ha_table_exists_in_engine is now used toi check if table is found in engine. Cleanup return codes from ha_create_table_from_engine. Change name of ha_table_exists to ha_table_exists_in_engine, update comment and returne codes. sql/handler.h: Remove paramter create_if_cound from ha_create_table_from_engine Rename ha_table_exists to ha_table_exists_in_engine sql/sql_base.cc: Use the function ha_table_exists_in_engine to detect if table exists in enegine. If it exists, call function ha_create_table_from_engine to try and create it. If create of table fails, set correct error message. sql/sql_table.cc: Add comments, remove parameter create_if_found to ha_create_table_from_engine. When dropping a table, try to discover it from engine. If discover fails, use same error message as if the table didn't exists. Maybe another message should be displayed here, ex: "Table could not be dropped, unpack failed" When creating a new table, use ha_table_exists_in_engine to check if a table with the given name already exists.
| * | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-06-302-9/+70
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into linux.site:/home/marty/MySQL/mysql-5.0 BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysys/default.c: Auto merged ndb/include/transporter/TransporterDefinitions.hpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged ndb/test/ndbapi/testBlobs.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-ucs2.c: Auto merged
| | * \ \ \ mergedunknown2005-06-161-2/+3
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged ndb/test/ndbapi/testBlobs.cpp: Auto merged sql/sql_select.cc: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: ul
| | | * | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-06-141-12/+74
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/export/space/pekka/ndb/version/my41
| | | * | | | ndb - valgrind fixesunknown2005-06-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/NdbDictionaryImpl.cpp: valgrind fixes ndb/test/ndbapi/testBlobs.cpp: valgrind fixes
| | * | | | | mergeunknown2005-06-141-9/+69
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged sql/item_cmpfunc.cc: Auto merged
| | | * | | | logging_ok:unknown2005-06-131-12/+74
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted DbtcMain.cpp, testTimeout.cpp: Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout ndb/test/ndbapi/testTimeout.cpp: Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | | mergeunknown2005-06-131-5/+5
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/common/logger/Logger.cpp: Auto merged ndb/test/ndbapi/testBlobs.cpp: Auto merged ndb/tools/restore/consumer_restore.cpp: Auto merged
| * | | | | Merge mysql.com:/home/jonas/src/mysql-5.0unknown2005-06-101-5/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/test/ndbapi/testBlobs.cpp: Auto merged
| | * \ \ \ \ Merge mysql.com:/home/jonas/src/mysql-4.1unknown2005-06-101-5/+5
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0 ndb/test/ndbapi/testBlobs.cpp: Auto merged
| | | * | | | ndb -unknown2005-06-101-5/+5
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mem leak in testBlobs ndb/test/ndbapi/testBlobs.cpp: Fix mem leak in testBlobs
| * | | | | Merge mysql.com:/home/jonas/src/mysql-5.0unknown2005-06-091-0/+101
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/include/ndbapi/Ndb.hpp: Auto merged ndb/src/ndbapi/Ndb.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/sql_parse.cc: Auto merged
| | * | | | mergeunknown2005-06-091-8/+7
| | | | | |
| | * | | | mergeunknown2005-06-091-0/+102
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/ndbapi/Ndb.hpp: Auto merged ndb/src/ndbapi/Ndbif.cpp: Auto merged ndb/src/ndbapi/Ndbinit.cpp: Auto merged ndb/test/ndbapi/testNdbApi.cpp: Auto merged ndb/test/run-test/daily-basic-tests.txt: Auto merged sql/ha_ndbcluster.cc: Auto merged
| | | * | | bug#11205 - ndb - 4006 when starting scanunknown2005-06-091-0/+102
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_subquery.result: Add testing of new 4006 handling mysql-test/t/ndb_subquery.test: Add testing of new 4006 handling ndb/include/ndbapi/Ndb.hpp: Check #transactions in startTransaction instead of getNdbCon ndb/src/ndbapi/Ndb.cpp: Check #transactions in startTransaction instead of getNdbCon ndb/src/ndbapi/NdbScanOperation.cpp: Check #transactions in startTransaction instead of getNdbCon ndb/src/ndbapi/Ndbif.cpp: Check #transactions in startTransaction instead of getNdbCon ndb/src/ndbapi/Ndbinit.cpp: Check #transactions in startTransaction instead of getNdbCon ndb/src/ndbapi/Ndblist.cpp: Check #transactions in startTransaction instead of getNdbCon ndb/test/ndbapi/testNdbApi.cpp: Check #transactions in startTransaction instead of getNdbCon ndb/test/run-test/daily-basic-tests.txt: Check #transactions in startTransaction instead of getNdbCon sql/ha_ndbcluster.cc: Check #transactions in startTransaction instead of getNdbCon
| * | | | Merge mysql.com:/home/jonas/src/mysql-5.0unknown2005-06-081-0/+239
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0-ndb BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged sql/sql_parse.cc: Auto merged
| | * | | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2005-06-081-0/+239
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0 ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/test/ndbapi/testNdbApi.cpp: Auto merged ndb/test/run-test/daily-basic-tests.txt: Auto merged ndb/tools/restore/Restore.cpp: Auto merged ndb/tools/restore/consumer_restore.cpp: Auto merged
| | | * | bug#11133 - ndbunknown2005-06-071-0/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incorrect handling of writeTuple with multi op transaction ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: 1) Pass operation instead of insertIsDone to LQH 2) transform operation correctly when in parallell que (multi op within same trans) ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Let ACC decide what operation was performed when WRITE ndb/test/ndbapi/testNdbApi.cpp: Add testcase for bug 11133 ndb/test/run-test/daily-basic-tests.txt: Add testcase for bug 11133
| * | | | ndb - update test prg for testDict -n NF1unknown2005-06-071-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: update test prg for testDict -n NF1 ndb/test/ndbapi/testDict.cpp: update test prg for testDict -n NF1
| * | | | Merge mysql.com:/home/jonas/src/mysql-5.0unknown2005-05-261-3/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0-ndb
| | * | | mergeunknown2005-05-261-3/+2
| | | | |
| * | | | Merge mysql.com:/home/jonas/src/mysql-5.0unknown2005-05-261-0/+113
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/common/transporter/SCI_Transporter.cpp: Auto merged sql/sql_select.cc: Auto merged
| | * | | mergeunknown2005-05-261-0/+113
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/common/transporter/SCI_Transporter.cpp: Auto merged ndb/src/common/transporter/SCI_Transporter.hpp: Auto merged ndb/src/common/transporter/SHM_Transporter.cpp: Auto merged ndb/src/common/transporter/SHM_Transporter.hpp: Auto merged ndb/src/common/transporter/TCP_Transporter.cpp: Auto merged ndb/src/common/transporter/TCP_Transporter.hpp: Auto merged ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged ndb/src/ndbapi/NdbOperationExec.cpp: Auto merged ndb/test/ndbapi/testNdbApi.cpp: Auto merged
| | | * | bug#10669 - ndb read wo/ get valueunknown2005-05-261-16/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add dummy getvalue ndb/src/ndbapi/NdbOperationExec.cpp: Add dummy get value of NDB$FRAGMENT if dirty read wo/ get values ndb/test/ndbapi/testNdbApi.cpp: Test scans as well
View Lorry Controller Status