Commit graph

583 commits

Author SHA1 Message Date
unknown
a6cb0e5ff1 ndb - use hugo methods all the way in hugo
more test program fixes
  replace pNdb->closeTransaction with closeTransaction(pNdb)


ndb/test/src/HugoTransactions.cpp:
  more test program fixes
    replace pNdb->closeTransaction with closeTransaction(pNdb)
2005-02-03 17:10:46 +01:00
unknown
d595ac8df8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2005-02-03 17:05:55 +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
cdce11a32b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/docs/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-01-29 07:11:22 +01:00
unknown
763dfd7b10 Merge
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
ndb/src/ndbapi/NdbRecAttr.cpp:
  merge
2005-01-27 18:41:23 +01:00
unknown
1ed40339e2 ndb - make YEAR and TIMESTAMP into ndb types
mysql-test/r/ndb_index_ordered.result:
  make YEAR and TIMESTAMP into ndb types
mysql-test/t/ndb_index_ordered.test:
  make YEAR and TIMESTAMP into ndb types
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/ndbapi/NdbDictionary.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/util/NdbSqlUtil.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/common/util/NdbSqlUtil.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionary.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbRecAttr.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/test/include/NdbSchemaOp.hpp:
  make YEAR and TIMESTAMP into ndb types
sql/ha_ndbcluster.cc:
  make YEAR and TIMESTAMP into ndb types
2005-01-27 17:33:35 +01:00
unknown
c6de5793d8 ndb - Make sure to install 16-node tests
ndb/test/run-test/Makefile.am:
  Make sure to instal 16 -node tests
2005-01-27 11:10:20 +01:00
unknown
f796818f94 merge
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2005-01-25 16:11:47 +01:00
unknown
e749259da6 ndb - Move mysql-test-run & testBackup into "basic suite"
ndb/test/run-test/atrt-mysql-test-run:
  Fix result handling
ndb/test/run-test/daily-basic-tests.txt:
  Move mysql-test-run & testBackup into "basic"
ndb/test/run-test/daily-devel-tests.txt:
  Move mysql-test-run & testBackup into "basic"
2005-01-25 15:56:20 +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
1c5dbc670b ndb - HugoCalculator, faster string generation
ndb/test/src/HugoCalculator.cpp:
  Better handling of strings
2005-01-19 18:28:04 +01:00
unknown
0eb1a8107f ndb - use reentrant functions in HugoCalulator
ndb/test/src/HugoCalculator.cpp:
  Use reentrant function in HugoCalulator
2005-01-18 08:08:36 +01:00
unknown
93e17bb3c7 ndb - fix bugs into test framework (updates values for pk's)
ndb/test/src/HugoCalculator.cpp:
  fix newly introduced bug in Hugo
ndb/test/src/HugoOperations.cpp:
  fix newly introduced bug in Hugo
2005-01-16 09:55:13 +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
d6cb2dbe5b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/test/src/HugoTransactions.cpp:
  Auto merged
2005-01-12 22:16:29 +01:00
unknown
54ccf5d16c added som signal printout functions
search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
    not necessarily the same starts and stops...
    +error corrected in ref signal
    added print of error codes + more correct error handling of event errors
    + added goto instead of erroneous break to fix bug#7627


ndb/include/kernel/signaldata/SignalData.hpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  added som signal printout functions
ndb/src/kernel/blocks/suma/Suma.cpp:
  search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
  not necessarily the same starts and stops...
  +error corrected in ref signal
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  indentation
  event error handling
  debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  debug printouts
  + added goto instead of erroneous break to fix bug#7627
ndb/test/src/HugoTransactions.cpp:
  added print of error codes + more correct error handling of event errors
2005-01-12 22:09:43 +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
6f041af11b ndb - Add test-case file for 16-nodes 2005-01-12 16:20:21 +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
2123dc6ba3 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 11:25:54 +01:00
unknown
40649e92f7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
2005-01-12 11:24:46 +01:00
unknown
7e36a0b7cb ndb - fix 64-bit problem in autotest
ndb/test/src/CpcClient.cpp:
  Fix 64-bit problem
2005-01-12 11:17:03 +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
unknown
7421239787 fixed testNdbApi to use new startTransaction interface 2005-01-10 11:54:03 +01:00
unknown
f029af067b Merge
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndb_constants.h:
  merge 5.0->5.0-ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge 5.0->5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  merge 5.0->5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  merge 5.0->5.0-ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  merge 5.0->5.0-ndb
2005-01-09 00:45:06 +01:00
unknown
2c12921a64 Merge
client/mysql.cc:
  Auto merged
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge
2005-01-08 22:34:16 +01:00
unknown
3186b340da ndb - wl-1442 fix Time ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Time.  adds new type id 25
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Time.  adds new type id 25
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Time.  adds new type id 25
sql/ha_ndbcluster.cc:
  wl-1442 fix Time.  adds new type id 25
2005-01-08 19:28:44 +01:00
unknown
633ee9b099 ndb - wl-1442 fix Date ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Date.  reuses old unused Timespec type id
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
sql/ha_ndbcluster.cc:
  wl-1442 fix Date.  reuses old unused Timespec type id
2005-01-08 16:57:51 +01:00
unknown
0338a61c88 ndb - wl-1442 minor
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1442 minor
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1442 minor
sql/ha_ndbcluster.cc:
  wl-1442 minor
2005-01-08 00:03:19 +01:00
unknown
2331344909 ndb - wl-1442 new varchar
mysql-test/r/ndb_alter_table.result:
  wl-1442 new varchar
mysql-test/r/ndb_bitfield.result:
  wl-1442 new varchar
mysql-test/r/ndb_charset.result:
  wl-1442 new varchar
mysql-test/t/ndb_charset.test:
  wl-1442 new varchar
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 new varchar
ndb/include/ndb_constants.h:
  wl-1442 new varchar
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 new varchar
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 new varchar
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbOperationDefine.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbOperationSearch.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbRecAttr.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbTransaction.cpp:
  wl-1442 new varchar
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1442 new varchar
sql/ha_ndbcluster.cc:
  wl-1442 new varchar
2005-01-07 11:55:20 +01:00
unknown
5ebc648ea4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-07 08:40:55 +01:00
unknown
58f8f9b3ca updated event example to make use of new NdbError member in NdbEventOperation
added my_pthread_init to get dbug print correct in Hugo
    added define for event error code



ndb/examples/ndbapi_event_example/ndbapi_event.cpp:
  updated event example to make use of new NdbError member in NdbEventOperation
  + use define to check error code
ndb/include/kernel/signaldata/CreateEvnt.hpp:
  updated create event signal to use define
ndb/include/ndbapi/NdbEventOperation.hpp:
  added NdbError member to NdbEventOperation
ndb/include/ndbapi/ndberror.h:
  added define for event error code
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  changed name of error code
ndb/src/ndbapi/NdbEventOperation.cpp:
  added NdbError
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  added debug printout
  added some error handling
ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  added NdbError
ndb/src/ndbapi/Ndberr.cpp:
  added NdbError for NdbEventOperationImpl
ndb/src/ndbapi/ndberror.c:
  changed some error codes
ndb/test/ndbapi/test_event.cpp:
  added testcase for BUG#7627
ndb/test/src/HugoTransactions.cpp:
  added printout in event
ndb/test/src/NDBT_Test.cpp:
  added my_pthread_init to get dbug print correct
2005-01-06 21:13:04 +01:00
unknown
40823e8a9c ndb increase max time for testTransactions
ndb/test/run-test/daily-basic-tests.txt:
  increase time for testTransactions
2005-01-04 07:16:30 +01:00
unknown
65defab653 merge 2005-01-03 09:24:18 +01:00
unknown
2a5aa24fab merge
configure.in:
  Auto merged
ndb/include/ndbapi/NdbApi.hpp:
  Auto merged
ndb/include/ndbapi/NdbReceiver.hpp:
  Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
  Auto merged
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
ndb/src/common/transporter/Transporter.hpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
2005-01-01 14:01:37 +01:00
unknown
a142cea8a3 ndb - more removal of old constructor usage in test prgs
ndb/test/ndbapi/flexAsynch.cpp:
  new constructor
ndb/test/ndbapi/flexHammer.cpp:
  new constructor
ndb/test/ndbapi/flexTT.cpp:
  new constructor
ndb/test/ndbapi/slow_select.cpp:
  new constructor
ndb/test/ndbapi/testDeadlock.cpp:
  new constructor
ndb/test/ndbapi/testLcp.cpp:
  new constructor
2005-01-01 09:28:24 +01:00
unknown
b99bea6704 manually merged
configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/fil0fil.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
2004-12-31 15:26:24 +01:00
unknown
2709f21556 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
ndb/test/ndbapi/testBitfield.cpp:
  Auto merged
2004-12-31 10:07:49 +01:00
unknown
d85262308b merge 2004-12-31 09:51:28 +01:00
unknown
5098405248 merge
BitKeeper/etc/logging_ok:
  auto-union
ndb/docs/wl2077.txt:
  Auto merged
ndb/include/Makefile.am:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Auto merged
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/util/Makefile.am:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/Services.hpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
ndb/src/ndbapi/NdbReceiver.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
ndb/test/ndbapi/testDict.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
ndb/test/tools/Makefile.am:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged
ndb/tools/delete_all.cpp:
  Auto merged
ndb/tools/desc.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  Auto merged
ndb/tools/select_count.cpp:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-12-31 06:36:32 +01:00
unknown
5df5f5c174 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/util/Makefile.am:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
ndb/test/tools/Makefile.am:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
2004-12-31 06:14:18 +01:00
unknown
e437be20b4 ndb testcases - more removal of old constructor
ndb/test/ndbapi/testBitfield.cpp:
  more removal of old constructor
ndb/test/ndbapi/testDataBuffers.cpp:
  more removal of old constructor
ndb/test/ndbapi/testNdbApi.cpp:
  more removal of old constructor
ndb/test/ndbapi/testReadPerf.cpp:
  more removal of old constructor
ndb/test/ndbapi/testScanPerf.cpp:
  more removal of old constructor
2004-12-30 11:55:08 +01:00
unknown
bd6f385064 ndb - more old constructors
ndb/test/ndbapi/testBackup.cpp:
  More old constructs
2004-12-29 16:27:27 +01:00
unknown
d31dd70b5a ndb - Update test programs to use new Ndb constructor
ndb/test/include/NDBT_Test.hpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/Bank.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/Bank.hpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankCreator.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankMakeGL.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankSumAccounts.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankTimer.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankTransactionMaker.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankValidateAllGLs.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/testBank.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/create_all_tabs.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/create_tab.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/drop_all_tabs.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/flexBench.cpp:
  Update to use new Ndb constructor
ndb/test/src/NDBT_Test.cpp:
  Update to use new Ndb constructor
ndb/test/tools/copy_tab.cpp:
  Update to use new Ndb constructor
ndb/test/tools/create_index.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoFill.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoLoad.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoLockRecords.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoPkDelete.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoPkRead.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoPkReadRecord.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoPkUpdate.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoScanRead.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoScanUpdate.cpp:
  Update to use new Ndb constructor
ndb/test/tools/verify_index.cpp:
  Update to use new Ndb constructor
2004-12-29 16:01:43 +01:00
unknown
f238eef38a ndb - fix test tools
ndb/test/tools/hugoScanRead.cpp:
  fix test tools
2004-12-28 17:23:32 +01:00