Commit graph

262 commits

Author SHA1 Message Date
unknown
cafae8175e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-04-13 07:43:03 +02:00
unknown
b83314e3d5 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
2005-04-11 10:26:18 +02:00
unknown
44dcec99b1 ndb - testOIBasic.cpp: 4.1->5.0 fix
ndb/test/ndbapi/testOIBasic.cpp:
  4.1->5.0 fix
2005-04-10 07:55:30 +02:00
unknown
9896cfdf32 bug#9749 - ndb
test case for case 9749, ndb lock upgrade via NDBAPI


ndb/test/ndbapi/testOperations.cpp:
  bug#9749 - test case for case 9749
2005-04-08 14:15:37 +02:00
unknown
19cedc5e3d ndb - wl-2455 TUP scan for testing in 5.0
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  fix readTuples signature
ndb/include/ndbapi/NdbScanOperation.hpp:
  fix readTuples signature
ndb/src/ndbapi/NdbScanOperation.cpp:
  fix readTuples signature
ndb/test/include/HugoTransactions.hpp:
  fix readTuples signature
ndb/test/ndbapi/testScanPerf.cpp:
  fix readTuples signature
ndb/test/src/HugoOperations.cpp:
  fix readTuples signature
ndb/test/src/HugoTransactions.cpp:
  fix readTuples signature
ndb/test/ndbapi/testOIBasic.cpp:
  fix readTuples signature
ndb/include/kernel/signaldata/AccScan.hpp:
  TUP scan for testing in 5.0
ndb/include/kernel/signaldata/NextScan.hpp:
  TUP scan for testing in 5.0
ndb/include/kernel/signaldata/ScanFrag.hpp:
  TUP scan for testing in 5.0
ndb/include/kernel/signaldata/ScanTab.hpp:
  TUP scan for testing in 5.0
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  TUP scan for testing in 5.0
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  TUP scan for testing in 5.0
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  TUP scan for testing in 5.0
ndb/src/kernel/blocks/dbtup/Makefile.am:
  TUP scan for testing in 5.0
ndb/test/ndbapi/testScan.cpp:
  TUP scan for testing in 5.0
2005-04-07 11:15:34 +02:00
unknown
7ec1e170c7 added testcase for multiple tables and events 2005-03-09 01:22:12 +01:00
unknown
857bc49d28 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-07 21:33:02 +01:00
unknown
dcd8383b86 added test compare function for testing event
fixed one bug in event, pk comes first in events...
2005-03-07 18:47:47 +01:00
unknown
6976089762 ndb - remove obsolete attribute storage type ACC vs TUP
ndb/include/kernel/signaldata/CreateEvnt.hpp:
  remove obsolete attribute storage type ACC vs TUP
ndb/include/kernel/signaldata/CreateIndx.hpp:
  remove obsolete attribute storage type ACC vs TUP
ndb/src/ndbapi/ndberror.c:
  remove obsolete attribute storage type ACC vs TUP
ndb/test/include/NdbSchemaOp.hpp:
  remove obsolete attribute storage type ACC vs TUP
ndb/test/ndbapi/bench/userInterface.cpp:
  remove obsolete attribute storage type ACC vs TUP
ndb/test/src/NdbSchemaOp.cpp:
  remove obsolete attribute storage type ACC vs TUP
2005-03-06 14:09:28 +01:00
unknown
e4d12c5ace Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-03 08:35:55 +01:00
unknown
af529fd14c Makefile.am:
updated ndb test makefile to make src dist complete


ndb/test/ndbapi/Makefile.am:
  updated ndb test makefile to make src dist complete
2005-03-02 00:25:16 +01:00
unknown
60e5117a79 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
2005-03-01 13:41:22 +01:00
unknown
df518e5546 merge
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
2005-03-01 13:39:22 +01:00
unknown
705fbb7633 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
2005-03-01 13:35:57 +01:00
unknown
eab1e62c2c bug#8853 - ndb - commit after nodefailure on not TC node
set exec_flag in execTC_COMMITREQ so that api will get rollbackrep


ndb/include/ndbapi/NdbConnection.hpp:
  Make getConnectedNode public
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Fix TC_COMMITREQ in abort cases
ndb/test/ndbapi/testNodeRestart.cpp:
  Testcase for bug#8853
ndb/test/run-test/daily-devel-tests.txt:
  Testcase for bug#8853
2005-03-01 13:32:11 +01:00
unknown
fed291dd7b added testcase for events where a "shadow table" is created 2005-02-23 16:57:07 +01:00
unknown
78757c18b3 ndb - testBitfield
remove unused method that gave compile error -pedantic


ndb/test/ndbapi/testBitfield.cpp:
  remove unused method that gave compile error -pedantic
2005-02-22 11:09:04 +01:00
unknown
8a40c5c71d corrected error in ndb programs debug switch 2005-02-21 23:15:30 +01:00
unknown
45064a4acc removed double declaration of opt_connect_str 2005-02-21 19:50:13 +01:00
unknown
6fc95e50a9 ndb - simple scan filter test (in testOIBasic)
ndb/src/ndbapi/NdbDictionary.cpp:
  print unusual array size
ndb/src/ndbapi/NdbRecAttr.cpp:
  print hex chars as unsigned
ndb/src/ndbapi/NdbOperationInt.cpp:
  ignore of NULL bound
ndb/test/ndbapi/testOIBasic.cpp:
  add simple scan filter test (table scan on index bounds)
2005-02-20 15:55:39 +01:00
unknown
c0a3bf06e0 added info to dump state 8004
added debug printouts
    changed mem allocation handling in event api
   split single and parallell event operation testing


ndb/src/kernel/blocks/suma/Suma.cpp:
  added info to dump state 8004
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  changed mem allocation handling in event api
ndb/test/ndbapi/test_event.cpp:
  split single and parallell event operation testing
2005-02-15 14:18:17 +01:00
unknown
28d3f08317 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 08:13:25 +01:00
unknown
7b5ef7cc0d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-11 08:10:46 +01:00
unknown
4f53f70f72 ndb - fix compiler warning (error using gcc-3.4.3)
ndb/test/ndbapi/bench/mainPopulate.cpp:
  compiler warning (error using gcc-3.4.3)
2005-02-11 08:09:47 +01:00
unknown
dd5767356b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 06:46:05 +01:00
unknown
0a0b9309eb Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
2005-02-11 06:42:57 +01:00
unknown
38e71e3ab8 ndb - old bench rescue
ndb/test/ndbapi/bench/mainPopulate.cpp:
  return correct
ndb/test/ndbapi/bench/userInterface.cpp:
  remove NA setting
ndb/test/run-test/daily-devel-tests.txt:
  set correct args
2005-02-11 06:39:00 +01:00
unknown
d8c74a9cd2 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


mysql-test/mysql-test-run.sh:
  Auto merged
2005-02-10 17:12:53 +01:00
unknown
ed74e8f9a6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-10 17:11:45 +01:00
unknown
86b0dc16d9 ndb - adapt old testprg to changes in ndbapi
ndb/test/ndbapi/bench/userInterface.h:
  adapt to changes in ndbapi
2005-02-10 17:07:14 +01:00
unknown
8da1c3e054 merge 2005-02-10 16:13:06 +01:00
unknown
b0af47bcd6 adopted test scripts
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added debug printouts
ndb/test/ndbapi/testDict.cpp:
  updated FragmentType tests, removed failing "equal" on the tables since they will not be equal because fragmentation is updated from the kernel
ndb/test/run-test/16node-tests.txt:
  adopted test scripts to new Fragment test name
ndb/test/run-test/basic.txt:
  adopted test scripts to new Fragment test name
ndb/test/run-test/daily-basic-tests.txt:
  adopted test scripts to new Fragment test name
2005-02-10 15:36:21 +01:00
unknown
cf5816096d ndb - Reenable old benchmark
ndb/test/ndbapi/Makefile.am:
  Reenable old benchmark
2005-02-10 11:40:32 +01:00
unknown
b0cc9d7ad7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/orca/space/pekka/ndb/version/my50
2005-02-08 11:12:55 +01:00
unknown
7e0ac12bd3 ndb - workaround to strnxfrm 5.0 problem
ndb/src/common/util/NdbSqlUtil.cpp:
  strnxfrm bug, may not write the length it says
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  fix index in debug print
ndb/test/ndbapi/testOIBasic.cpp:
  do not generate too many mb chars, not checked in TUP
2005-02-08 10:33:58 +01:00
unknown
6dc62ae2fe Merge
configure.in:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testScan.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged
2005-02-06 10:44:15 +01:00
unknown
37b4b89ebe bug8262 - ndb
crash if scan is poped from queue before all attrinfo has arrived


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  only restart scan if all attrinfo has arrived
  otherwise just set remove from queue and set state
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  new error insert - force send attrinfo
ndb/test/ndbapi/testScan.cpp:
  new test bug8262 many threads - scanning small tables
ndb/test/run-test/daily-basic-tests.txt:
  run new test case in autotest
2005-02-06 10:00:29 +01:00
unknown
3a7f82ef3c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
2005-02-04 06:10:56 +01:00
unknown
ef5c8dbf7b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


configure.in:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
2005-02-04 06:09:43 +01:00
unknown
e7c3dc943c merge
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/test/include/HugoOperations.hpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
2005-02-03 17:04:27 +01:00
unknown
a5463c252a corrected automerge error
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
  Auto merged
ndb/test/ndbapi/flexBench.cpp:
  Auto merged
ndb/test/ndbapi/flexHammer.cpp:
  Auto merged
ndb/test/ndbapi/flexTT.cpp:
  Auto merged
ndb/test/ndbapi/flex_bench_mysql.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  corrected automerge error
2005-02-03 17:00:51 +01:00
unknown
1bbfa6f75f ndb -
add abort to multi op test case


ndb/include/ndbapi/NdbConnection.hpp:
  Add aborts to test case
ndb/test/include/HugoOperations.hpp:
  Add aborts to test case
ndb/test/ndbapi/testOperations.cpp:
  Add aborts to test case
ndb/test/src/HugoOperations.cpp:
  Add aborts to test case
ndb/test/src/HugoTransactions.cpp:
  Add aborts to test case
2005-02-02 21:03:46 +01:00
unknown
cf660b001e cleanup and streamlining of thread create/exit in ndb 2005-02-01 19:01:37 +01:00
unknown
3a890c8a87 ndb -
1) New testcase
   Check every combination of ins/upd/del of length 5
   Check reading savepoint's
2) Fix 1 liner in acc wrt committing read


ndb/include/ndbapi/NdbConnection.hpp:
  Make testcase friend
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix so that committing a READ can _not_ result in setting elementIsDisappeared
ndb/test/include/NDBT_Test.hpp:
  Make copy of testcase name
ndb/test/ndbapi/testOperations.cpp:
  New testcase
    Check every combination of ins/upd/del of length 5
    Check reading savepoint's
ndb/test/src/HugoOperations.cpp:
  Close transaction in destructor
ndb/test/src/NDBT_Test.cpp:
  Make copy of testcase name
2005-02-01 16:49:23 +01:00
unknown
be3b13749e ndb - Add includes to test prg as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexAsynch.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexBench.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexHammer.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/slow_select.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/src/HugoCalculator.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
2005-01-23 20:13:42 +01:00
unknown
3705bf9dfb wl2240 - ndb - new testcase for validating startTransation with hint
ndb/include/ndbapi/NdbDictionary.hpp:
  NdbDictionaryColumn::getSizeInBytes
ndb/include/ndbapi/NdbOperation.hpp:
  NdbOperation::getTable
ndb/include/ndbapi/NdbTransaction.hpp:
  Make getConnectionNodeId public (for test programs)
ndb/include/util/Base64.hpp:
  base64(void*)
ndb/src/common/util/Base64.cpp:
  base64(void*)
ndb/src/kernel/blocks/ERROR_codes.txt:
  New error code for REF'ing non-local TCKEYREQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Easy clearing of ERROR_INSERT
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  New error code for REF'ing non-local TCKEYREQ
ndb/src/ndbapi/NdbDictionary.cpp:
  NdbDictionaryColumn::getSizeInBytes
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  If m_noIfDistKyes == 0, then each PK is dist key
ndb/src/ndbapi/NdbOperation.cpp:
  NdbOperation::getTable
ndb/src/ndbapi/NdbOperationSearch.cpp:
  remove d-key handling for pk ops
ndb/test/include/HugoCalculator.hpp:
  remove unimpletemented methods
ndb/test/include/HugoOperations.hpp:
  1) HugoOperation::setTransaction 
  2) Type independant value handling
  3) Some more util methods
ndb/test/ndbapi/testPartitioning.cpp:
  new testcase for validating startTransation with hint
ndb/test/run-test/atrt-mysql-test-run:
  fix checks of return values
ndb/test/src/HugoCalculator.cpp:
  Better generation of values
   -- depends on fact that srand(K), rand() == srand(K), rand()
  Generate string with base64
ndb/test/src/HugoOperations.cpp:
  1) HugoOperation::setTransaction 
  2) Type independant value handling
  3) Some more util methods
2005-01-14 08:58:50 +01:00
unknown
c992cc4962 ndb - more test of partitioning wrt scans & lock modes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle "fragment scan" (scan with distribution key) wrt committed read
ndb/test/ndbapi/testPartitioning.cpp:
  Extend test prg to try differnt lock modes / parallelism parameters
2005-01-12 17:29:46 +01:00
unknown
8296883ff4 ndb - Fix problem with parallelism < fragcount & committedread
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Pre book fragments to keep count how many ops need to be continued by 
    api
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Pre book fragments to keep count how many ops need to be continued by 
    api
  
  Fixes problem with parallelism < fragcount && committed read
ndb/test/ndbapi/testScan.cpp:
  new testcase for scan parallelism
ndb/test/run-test/daily-basic-tests.txt:
  Run new testcase
ndb/test/src/HugoTransactions.cpp:
  Use parallelism parameter
2005-01-12 15:36:52 +01:00
unknown
cd3b9f5790 ndb compile warnings
ndb/test/include/NDBT_Test.hpp:
  compile warnings
ndb/test/ndbapi/bank/BankLoad.cpp:
  compile warnings
ndb/test/ndbapi/testOIBasic.cpp:
  compile warnings
ndb/test/src/HugoCalculator.cpp:
  compile warnings
ndb/test/src/NDBT_Test.cpp:
  compile warnings
ndb/test/src/NdbBackup.cpp:
  compile warnings
ndb/test/src/NdbRestarts.cpp:
  compile warnings
2005-01-11 19:45:57 +01:00
unknown
f755e4aece wl2240 - ndb partitioning
1) Fix startTransaction with hint
2) Ship fragment data to API to make better guess
3) Expose both primary & backup replicas 
   To (in the future) be even more clever on choosing nodes for
   transactions/operations


ndb/include/kernel/ndb_limits.h:
  Set maxsize of array with fragment data
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Send fragment data to API
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Use Uint16 for fragment info
  Fix uninit variable
ndb/src/ndbapi/Ndb.cpp:
  Impl. startTransaction with hint
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add interface for retreiving replica nodes given a hash-value
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Add interface for retreiving replica nodes given a hash-value
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  remove Fragment2NodeMap and put it on table instead
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  remove Fragment2NodeMap and put it on table instead
ndb/test/ndbapi/testNdbApi.cpp:
  Test some more
2005-01-10 14:40:54 +01:00