Commit graph

421 commits

Author SHA1 Message Date
unknown
6a908c4322 Two level data access of operation i-value insted of huge fixed
size array.
Added a number of subroutines for this
2004-08-17 13:18:20 +02:00
unknown
5a9d28e33f Merge mronstrom@bk-internal.mysql.com:/users/mronstrom/wl2025
into mysql.com:/Users/mikron/wl2025


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2004-08-11 17:40:57 +02:00
unknown
4294f84728 Finalised first step of scan optimisations
Everything is working but a few things is still remaining


ndb/include/kernel/ndb_limits.h:
  New maximum batch size and total batch size over cluster
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Only two options
  1) One fragment per node
  2) One fragment in total
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  First step preparing for a dynamic array for scan_acc_op_ptr.
  Prepared by hiding all accesses by subroutines.
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  First step preparing for a dynamic array for scan_acc_op_ptr.
  Prepared by hiding all accesses by subroutines.
  Removed some dead code
2004-08-11 17:36:31 +02:00
unknown
f72b82bd2d Merge build.mysql.com:/home/bk/mysql-4.1-ndb
into build.mysql.com:/users/mronstrom/wl2025


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
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-08-11 12:18:12 +02:00
unknown
b689f4873e Fix of a nasty bug, small but hard to find
Some small printout fixes


ndb/include/kernel/signaldata/ScanFrag.hpp:
  Mixed up Hexadecimal and decimal notation, cost me 5 hours of
  debugging to find, grrr..
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Fixed some declaration so that new bigger info fits in variables
ndb/test/ndbapi/testScanPerf.cpp:
  Fix for printing int's instead of Uint64 which for some reason
  caused problems on my Mac.
  Also print performance in each loop.
2004-08-11 12:08:30 +02:00
unknown
ef0d6d35ea Add indexes to test toolkit
ndb/test/include/NDBT_Table.hpp:
  Remove unused parameter
ndb/test/include/NDBT_Tables.hpp:
  Add existsOk
ndb/test/src/NDBT_Tables.cpp:
  Rename C2_* tables to I{123}
  Add indexes to I{123}
ndb/test/src/NDBT_Test.cpp:
  Rename C2_* tables to I{123}
  Add indexes to I{123}
2004-08-11 10:03:43 +02:00
unknown
f0e1384460 Mismatched parantases #ifdef 2004-08-11 08:23:12 +02:00
unknown
f4f8b0d873 print test tables
ndb/test/run-test/daily-basic-tests.txt:
  Use T13 (bigger) for testBasic -n Fill
2004-08-11 08:21:31 +02:00
unknown
a550a61f8c Fix uninit variable bug "surfaced" by removing mem init in SimulatedBlock
ndb/include/kernel/signaldata/StartInfo.hpp:
  Fix signal len
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Put init in constructor
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Send corrent start_inforef
  Init NodeRecord::allowNodeStart
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Remove all mem-inits so that debug/release don't differ
2004-08-11 07:15:37 +02:00
unknown
e9a4ea902a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/common/transporter/Transporter.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-08-10 17:42:51 +02:00
unknown
c90e962021 Merge mysql.com:/home/jonas/src/bug-4586
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-08-10 17:29:19 +02:00
unknown
394e0ad470 merge bug 4586 2004-08-10 17:27:07 +02:00
unknown
ec5c569103 Removing const declaration of allocRecord to fix compile problem 2004-08-10 17:09:08 +02:00
unknown
00ac20eb6c Cset exclude: joreland@mysql.com|ChangeSet|20040805155331|12859
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Exclude
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Exclude
2004-08-10 16:05:27 +02:00
unknown
a8ac22a932 bug#4586
Removed printouts


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Removed printouts
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Removed printouts
2004-08-10 16:04:07 +02:00
unknown
186d5db0ea bug-4586
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Disallow expand during redo log execution and reeanble it after
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Disallow expand during redo log execution and reeanble it after
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Maintain list of fragment which should be reenabled after redo log execution
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Maintain list of fragment which should be reenabled after redo log execution
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Reenable when send START_RECCONF
2004-08-10 15:51:31 +02:00
unknown
c029d1b973 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-10 15:19:07 +02:00
unknown
183e7b6f86 ndb test fixes
ndb/test/ndbapi/testIndex.cpp:
  test fixes
ndb/test/ndbapi/testNodeRestart.cpp:
  test fixes
ndb/test/run-test/daily-devel-tests.txt:
  disable non function test
2004-08-10 15:16:48 +02:00
unknown
9e93c0acff Missing result handling in bug fix for bug#3912 2004-08-10 15:04:40 +02:00
unknown
af0f14ded4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-10 14:48:22 +02:00
unknown
aff3e76b6b Merge build.mysql.com:/home/bk/mysql-4.1-ndb
into build.mysql.com:/users/mronstrom/wl2025


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-10 14:38:34 +02:00
unknown
89017ca5b0 Bug fix for bug#3912 2004-08-10 14:38:24 +02:00
unknown
0c7f040470 ndb_mgmd occasional core-dumps
clear connect flag before doing disconnect


ndb/src/common/transporter/Transporter.cpp:
  clear connect flag before doing disconnect
2004-08-10 13:40:19 +02:00
unknown
11d177b66f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Auto merged
2004-08-10 12:36:33 +02:00
unknown
04cc2cc4d1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-10 11:48:43 +02:00
unknown
ce804e4c7b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-10 10:22:49 +02:00
unknown
9b3d5b9cdb Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/mysql-4.1-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
2004-08-09 17:59:37 +02:00
unknown
65f6fcaff2 Correction + move of code to NDB_DEBUG_FULL from VM_TRACE
ndb/include/transporter/TransporterDefinitions.hpp:
  Correction for bad math
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Moved heavy check code to NDB_DEBUG_FULL
2004-08-09 17:51:37 +02:00
unknown
fd566261a4 First step for WL 2025
Not yet fully working
Scan reads work fine, not scan updates


ndb/include/kernel/ndb_limits.h:
  Introducing a new parameter plus increasing the max no of parallel
  operations per scan in LQH, first step in WL 2025
ndb/include/kernel/signaldata/ScanFrag.hpp:
  Only need one clientOpPtr
  Concurrency is batch_size to use in this scan
  batch_byte_size is max no of bytes sent in a batch
  first_batch_size is the batch size in the first batch
ndb/include/kernel/signaldata/ScanTab.hpp:
  apiOperationPtr is sent as long signal data
  batch_byte_size and first_batch_size is needed for further transport
  to LQH
  batch size can now be bigger than before
ndb/include/kernel/signaldata/TcKeyReq.hpp:
  More concurrency means more size for scanInfo also in TCKEYREQ
ndb/include/ndbapi/NdbReceiver.hpp:
  New subroutine to caclculate batch size and similar parameters
ndb/include/ndbapi/NdbScanOperation.hpp:
  batch size calculated before sending, not necessary to store anymore
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Updated signal printer for SCAN_TABREQ
ndb/src/kernel/blocks/backup/Backup.cpp:
  Fixes to make it compile, not fixed for BACKUP being useful yet
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Removed parameters no longer needed and added some new ones.
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix for cmaxAccOps that was using the wrong constant
  Removed old code
  New SCAN_FRAGREQ signal
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  New variables
  Removed dead code
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  New SCAN_TABREQ, SCAN_FRAGREQ, SCAN_FRAGCONF and SCAN_TABCONF
  Fixed some error handling to be more efficient
ndb/src/kernel/blocks/suma/Suma.cpp:
  Fixes to make it compile, not yet usable for SUMA features
ndb/src/kernel/vm/Configuration.cpp:
  Fix for wrong constant
ndb/src/ndbapi/NdbApiSignal.cpp:
  Fix for not using constants
ndb/src/ndbapi/NdbApiSignal.hpp:
  Added possibility to get signal sending node from signal
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Moved declaration
ndb/src/ndbapi/NdbReceiver.cpp:
  New routine to calculate batch_size etc.
ndb/src/ndbapi/NdbScanOperation.cpp:
  Various fixes for sending SCAN_TABREQ and other stuff
2004-08-09 17:43:15 +02:00
unknown
520a745891 mysql-test ndb_index_unique
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Compensate for "extra" lqhkeyreqrec during index read (when IgnoreError)
ndb/src/mgmsrv/main.cpp:
  Read corrent local node id
ndb/tools/waiter.cpp:
  Yet another user of LocalConfig
2004-08-09 15:13:46 +02:00
unknown
96587f58c8 Forgott to update testBackuo w.r.t to ConfigRetreiver 2004-08-09 14:10:50 +02:00
unknown
a95ad750b4 testBlobs take more than 5-minutes (but less than 10) 2004-08-09 13:57:01 +02:00
unknown
1905e1c5ac bug#4529
ndb/include/mgmcommon/ConfigRetriever.hpp:
  Separate connect and all/fetch
ndb/include/mgmcommon/LocalConfig.hpp:
  Use BaseString
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Separate connect and all/fetch
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Removed useless onlyNodeId
ndb/src/kernel/main.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.hpp:
  Separeted Configuration fetch/setup
ndb/src/mgmapi/mgmapi.cpp:
  Fixed some return codes
ndb/src/mgmclient/main.cpp:
  LocalConfig update
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Changes ConfigRetreiver interface
ndb/src/mgmsrv/Services.cpp:
  Allow reserve same id twice
ndb/src/mgmsrv/main.cpp:
  Ignore SIGPIPE
ndb/src/ndbapi/TransporterFacade.cpp:
  ConfigRetriever interface
2004-08-09 13:25:07 +02:00
unknown
89b446969a testTransaction -n FRead*
testTransaction -n *Scan*
testTimeout -n *


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Added DUMP for tc appl timeout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Send tckey conf if m_exec_flags is set
  Added dump for appl timeout
ndb/test/include/HugoOperations.hpp:
  Add scanRead
ndb/test/ndbapi/testTimeout.cpp:
  Reenable
ndb/test/ndbapi/testTransactions.cpp:
  Fix scan test cases
ndb/test/run-test/daily-basic-tests.txt:
  reenable timeout-tests
  added testTransaction -n Scan* testcases
ndb/test/src/HugoOperations.cpp:
  Fix scan
ndb/test/src/NDBT_Test.cpp:
  Drop table before test...(if createTable==true)
2004-08-09 09:44:05 +02:00
unknown
fbceeb05fe Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/ll


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-08-08 20:58:57 +02:00
unknown
a968c37f19 testDict -n CreateMaxTables
- Init _all_ of CREATE_TABLE_REF


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Init _all_ of CREATE_TABLE_REF
2004-08-08 20:27:39 +02:00
unknown
2cebb9308c Merge
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.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/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
2004-08-07 09:11:18 +02:00
unknown
20e8d38bd0 Jammed Qmgr a bit more
Fixed Bug #4935, initialise before connecting again
Some lines removed
2004-08-06 20:22:34 +02:00
unknown
2bb314c2c5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-08-06 11:31:53 +02:00
unknown
01e1451ad8 Bug#4586 + TC fix
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Operations with marker always leads to abort even
  if IgnoreError was supplied (limitation)
  
  Check marker before marking operation as aborted (which removes marker)
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Init cnoOfAllocatedPages after returnCommonArea
2004-08-06 11:29:56 +02:00
unknown
0bf9c56bf0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged
2004-08-06 10:06:58 +02:00
unknown
e4837b10d9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/ll


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged
2004-08-06 10:04:58 +02:00
unknown
bcdc77b3d1 Fixed ndb backup bug
ndb/src/kernel/blocks/backup/Backup.hpp:
  SCAN_FRAGCONF contains length of key(s) aswell
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Send correct signal length
2004-08-06 09:43:06 +02:00
unknown
8e55628d38 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-06 06:13:45 +02:00
unknown
689f4f2735 removed unused and illegal print method 2004-08-05 23:39:12 +02:00
unknown
acd3775521 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-08-05 23:02:31 +02:00
unknown
432e469746 Merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  SCCS merged
2004-08-05 22:32:25 +02:00
unknown
e223c07eb1 Merge joreland@bk-internal.mysql.com:irix
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/test/ndbapi/testBasic.cpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-05 22:19:52 +02:00
unknown
a2b6166e0d Fix for BUG #4096
Introduced refresh of watch dog at various places and
removed init of memory in allocRecord
Also changed default watch to 6 seconds
2004-08-05 20:16:45 +02:00
unknown
6c8df36263 Small fix for updated config params 2004-08-05 18:51:27 +02:00