Commit graph

426 commits

Author SHA1 Message Date
unknown
1f8b95514e merge
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/testBackup.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
2005-04-22 09:30:23 +02:00
unknown
d9faad9c1a bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
bug#9960 - ndb backup
      increase wait completed timeout to 48 hours


ndb/include/kernel/signaldata/BackupImpl.hpp:
  Add nodeid to reply to be able to fake reply during NF
ndb/include/kernel/signaldata/BackupSignalData.hpp:
  new error codes
ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  fix printout
ndb/src/kernel/blocks/backup/Backup.cpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.hpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.txt:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Init own version
ndb/src/mgmapi/mgmapi.cpp:
  bug#9960 - ndb backup
    increase wait completed timeout to 48 hours
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/ndbapi/ndberror.c:
  new error codes
ndb/test/ndbapi/testBackup.cpp:
  fix return codes
ndb/test/run-test/daily-basic-tests.txt:
  Add failure test cases to autotest
ndb/test/src/NdbBackup.cpp:
  fix error codes
  introduce checking of backup resources after each test
2005-04-22 09:07:25 +02:00
unknown
92a00143d7 CSC5149 - ndb test programs
Fix src distributions for benchmark prg
2005-04-19 11:17:32 +02:00
unknown
0ac0427d79 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
2005-04-19 11:06:11 +02:00
unknown
79fd09040b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-18 12:47:47 +02:00
unknown
76fc723532 bug#9892 - ndb index activation
4.1->5.0 merge fix
2005-04-18 12:46:35 +02:00
unknown
14a3b8c816 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/test/ndbapi/testIndex.cpp:
  Auto merged
2005-04-18 12:45:17 +02:00
unknown
135c7b5a1d bug#9892
Make BUILDINDX RF_LOCAL aware


ndb/src/ndbapi/Ndbif.cpp:
  allow TCKEY_FAILREF w/ invalid magic number also when NDB_NODROPPED_SIGNAL
ndb/test/ndbapi/testIndex.cpp:
  Run only 1 update thread during NFNR2_O
2005-04-18 12:41:12 +02:00
unknown
c45d5eba65 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb


mysql-test/Makefile.am:
  Auto merged
2005-04-14 22:27:43 +02:00
unknown
9ab870aab2 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-04-14 13:46:32 +02:00
unknown
780bd17c14 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
2005-04-14 13:32:38 +02:00
unknown
7cd428b16c Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb


mysql-test/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2005-04-14 05:39:22 +02:00
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
59acb039fb bug#9749 - ndb lock upgrade
handle more cases...


ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  bug#9749 - ndb lock upgrade
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  bug#9749 - ndb lock upgrade
ndb/test/ndbapi/testOperations.cpp:
  bug#9749 - ndb lock upgrade
2005-04-12 17:54:34 +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
eeb6c9a9ec ndb - wl-2451: Increase max schema object to > 1600
mysql-test/Makefile.am:
  divide schemafile in blocks to allow unlimited # objects
ndb/include/debugger/SignalLoggerManager.hpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/include/kernel/ndb_limits.h:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/common/debugger/SignalLoggerManager.cpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/test/ndbapi/testDict.cpp:
  divide schemafile in blocks to allow unlimited # objects
2005-04-10 22:43:17 +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