Commit graph

217 commits

Author SHA1 Message Date
unknown
08ffa2988d Moved event category match functionality into mgmapi
Removed grep introduced bogus mgm call


BitKeeper/deleted/.del-LogLevel.cpp~314a6bada2df40a8:
  Delete: ndb/src/common/debugger/LogLevel.cpp
ndb/include/debugger/EventLogger.hpp:
  Removed match functionality and put into mgmapi
ndb/include/kernel/LogLevel.hpp:
  Update LogLevel
ndb/include/mgmapi/mgmapi_config_parameters.h:
  fix parameter
ndb/src/common/debugger/EventLogger.cpp:
  Removed match functionality and put into mgmapi
ndb/src/common/debugger/Makefile.am:
  removed LogLevel.cpp
ndb/src/cw/cpcd/APIService.cpp:
  compiler warning
ndb/src/cw/cpcd/CPCD.cpp:
  compiler warning
ndb/src/cw/cpcd/CPCD.hpp:
  compiler warning
ndb/src/cw/cpcd/main.cpp:
  compiler warning
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Changed name of config parameter
ndb/src/kernel/vm/Configuration.cpp:
  Changed name of config parameter
2004-09-17 08:28:22 +02:00
unknown
1da0c31b84 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/mgmsrv/main.cpp:
  Auto merged
2004-09-16 18:09:35 +02:00
unknown
2468e5ba46 wl1668 -
Add support for getting events via mgmapi
removed all traces of stat port


BitKeeper/deleted/.del-NodeLogLevel.cpp~324045b93af7123b:
  Delete: ndb/src/mgmsrv/NodeLogLevel.cpp
BitKeeper/deleted/.del-NodeLogLevel.hpp~4f4ab0fe52fb497c:
  Delete: ndb/src/mgmsrv/NodeLogLevel.hpp
BitKeeper/deleted/.del-NodeLogLevelList.cpp~97dc9c909e3e92bf:
  Delete: ndb/src/mgmsrv/NodeLogLevelList.cpp
BitKeeper/deleted/.del-NodeLogLevelList.hpp~ef567dd850abddc7:
  Delete: ndb/src/mgmsrv/NodeLogLevelList.hpp
ndb/include/debugger/EventLogger.hpp:
  Split EventLogger into two classes
ndb/include/kernel/LogLevel.hpp:
  Add some nice to have methods + use uint8 for storage
ndb/include/kernel/signaldata/EventSubscribeReq.hpp:
  operator=
ndb/include/kernel/signaldata/SetLogLevelOrd.hpp:
  operator=
ndb/include/mgmapi/mgmapi.h:
  remove deprecated vars
ndb/src/common/debugger/EventLogger.cpp:
  Split into 2
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Remove hardcoded mgm stuff
ndb/src/mgmsrv/CommandInterpreter.cpp:
  #if 0
  some deprecated code
ndb/src/mgmsrv/Makefile.am:
  remove NodeLogLevel*
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Remove dead code
  Handle multiple event listeners in mgmapi
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Remove dead code
  Handle multiple event listeners in mgmapi
ndb/src/mgmsrv/Services.cpp:
  listen event method in mgmapi
ndb/src/mgmsrv/Services.hpp:
  listen event method in mgmapi
ndb/src/mgmsrv/main.cpp:
  remove stat port
2004-09-16 18:02:41 +02:00
unknown
69b9bbdb20 ndb charsets: metadata in TUP, TUX 2004-09-16 12:57:15 +02:00
unknown
39c2f42168 ndb charsets: DICT 2004-09-15 17:44:13 +02:00
unknown
25086da570 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-09-01 04:52:50 +02:00
unknown
540c90e407 Added some more options to TC timers, such as:
1) explicit start/stop timer (instead of perodical reports)
2) scan & range scan reporting
2004-08-31 22:12:08 +02:00
unknown
fa5d6ac3b3 Added 3 psuedo columns
Cleaned up code
Changed ndb_select_all


ndb/include/kernel/AttributeHeader.hpp:
  Added commit count to psuedo columns
  Added bit for psuedo columns
ndb/include/kernel/GlobalSignalNumbers.h:
  Changed into READ_PSUEDO
ndb/include/ndbapi/NdbDictionary.hpp:
  Added 3 psuedo columns
ndb/include/ndbapi/NdbOperation.hpp:
  Added 3 psuedo columns
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/ndbapi/NdbDictionary.cpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbOperation.cpp:
  Added 3 psuedo columns
ndb/tools/select_count.cpp:
  Changed select_count into using new features
2004-08-27 22:31:16 +02:00
unknown
db2343e8d7 merge
BitKeeper/etc/logging_ok:
  auto-union
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
2004-08-25 12:17:43 +02:00
unknown
00ca62f046 merge count(*) optim with wl2025
BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
2004-08-25 08:49:46 +02:00
unknown
d2c8f1a762 Implemented general purpose psuedo columns: row_count & fragment
Implemented new interpreter instruction: exit_ok_last

This two new features combined can be used to make fast select count
 


ndb/include/kernel/AttributeHeader.hpp:
  Psuedo columns fragment & row_count
ndb/include/kernel/GlobalSignalNumbers.h:
  Impl. READ_ROWCOUNT
ndb/include/kernel/signaldata/TupKey.hpp:
  Remove unused pageId pageIndex and replace with lastRow flag
ndb/include/ndbapi/NdbOperation.hpp:
  New instruction for last_row
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  REQ_ROWCOUNT + last row
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  REQ_ROWCOUNT + last row
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add readers for new psuedo columns
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Add readers for new psuedo columns
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Add readers for new psuedo columns
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Use exit ok (not ok_last)
ndb/src/ndbapi/NdbOperationExec.cpp:
  Use exit ok (not ok_last)
ndb/src/ndbapi/NdbOperationInt.cpp:
  New instruction
2004-08-24 23:27:32 +02:00
unknown
b0d64c68b8 Removed some error codes since the errors are hard errors which
need ndbrequire instead.
2004-08-24 00:15:04 +02:00
unknown
2c7754be96 Merge build.mysql.com:/home/bk/mysql-4.1-ndb
into build.mysql.com:/users/mronstrom/wl2056


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-21 15:11:47 +02:00
unknown
b85e699ec8 New config parameters for Log Page Buffers
Fixing issue with NO_OF_FRAG_PER_NODE
Also removed some OSE code no longer needed when configurable log pages 


ndb/include/kernel/signaldata/FsCloseReq.hpp:
  Removing annoying compiler warning
ndb/include/mgmapi/mgmapi_config_parameters.h:
  New config parameters for Log Page Buffers
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  New config parameters for Log Page Buffers
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/vm/pc.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
2004-08-21 13:14:27 +02:00
unknown
d8e92342c5 Merge joreland@bk-internal.mysql.com:wl2025
into mysql.com:/home/jonas/src/wl2025


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
2004-08-19 10:37:46 +02:00
unknown
9dc57a2a7f Some platfom compile/build fixes for ndb
ndb/include/kernel/Interpreter.hpp:
  R1 defined on some platforms
ndb/include/util/BaseString.hpp:
  fix for compiler bug
2004-08-19 08:24:27 +00:00
unknown
68da9ff339 wl2025 - fix suma & backup
pluse remove "first_batch_size" and instead put
batch_size on next_scan_req


ndb/include/kernel/signaldata/ScanFrag.hpp:
  Rename
  * concurrency -> batch_size_bytes
  * batch_byte_size -> batch_size_bytes
  
  Removed first_batch_size and
  added size parameters to SCAN_NEXTREQ
ndb/src/kernel/blocks/backup/Backup.cpp:
  Adopt to SCAN_FRAG_CHANGES
ndb/src/kernel/blocks/backup/Backup.hpp:
  Adopt to SCAN_FRAG_CHANGES
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Renamed
  scanCompletedOperations -> m_curr_batch_size_rows
  scanConcurrentOperations -> m_max_batch_size_rows
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Renamed
  scanCompletedOperations -> m_curr_batch_size_rows
  scanConcurrentOperations -> m_max_batch_size_rows
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Adopt to SCAN_FRAG_CHANGES
ndb/src/kernel/blocks/suma/Suma.cpp:
  Adopt to SCAN_FRAG_CHANGES
2004-08-19 07:43:06 +02:00
unknown
a443bee804 Added configuration parameters for batch size, batch byte size
and max scan batch size
Removed some debug printouts
2004-08-18 11:55:37 +02:00
unknown
fc669d12e0 18 bits didn't fit into Uint16 2004-08-18 09:44:25 +02:00
unknown
f03022b22a Fix bugs + include check of batch_byte_size and
use of first_batch_size


ndb/include/kernel/ndb_limits.h:
  New maximum size
ndb/include/kernel/signaldata/ScanFrag.hpp:
  New error code
ndb/include/kernel/signaldata/ScanTab.hpp:
  Need to go to Uint16 when batch size > 255
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Uint8 => Uint16 when batch_size > 255
  New and changed methods for acc ptr's and
  checking end of scan batch (incl. check of batch_byte_size
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Uint8 => Uint16 when batch_size > 255
  New and changed methods for acc ptr's and
  checking end of scan batch (incl. check of batch_byte_size
2004-08-17 17:55:47 +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
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
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
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
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
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
83c9f45fc2 Remove unused config parameters
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-05 18:23:01 +02:00
unknown
ac8b4881c1 Merge 4.1 with jonas irix clone
BitKeeper/etc/logging_ok:
  auto-union
ndb/include/kernel/NodeState.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/include/util/Bitmask.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.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/dbdih/DbdihInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CpcClient.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/include/NDBT_Table.hpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoOperations.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
ndb/test/src/NDBT_Tables.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-03 14:16:16 +02:00
unknown
ce0abdede7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-tux


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-07-28 12:53:23 +02:00
unknown
41f3a2dcf2 Merge
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  SCCS merged
2004-07-27 11:57:04 +02:00
unknown
0c6d41a86e tux - remove obsolete signals tux->tup
BitKeeper/deleted/.del-TupAccess.cpp~5273de82afd8d7d0:
  Delete: ndb/src/common/debugger/signaldata/TupAccess.cpp
BitKeeper/deleted/.del-TupAccess.hpp~a9b722c1d6fa1442:
  Delete: ndb/include/kernel/signaldata/TupAccess.hpp
2004-07-26 12:35:05 +02:00
unknown
6c73e4d98c Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-tux
2004-07-23 14:16:08 +02:00
unknown
9864327a61 ha_ndb blobs 2004-07-22 12:33:14 +02:00
unknown
8a23601e06 Remove the remains of SCAN_TABINFO signal
ndb/include/kernel/GlobalSignalNumbers.h:
  Remove unused signal number for GSN_SCAN_TABINFO
ndb/include/kernel/signaldata/ScanTab.hpp:
  Remove definition of old signal ScanTabInfo
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Removed old print function for SCAN_TABINFO
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Removed name for GSN_SCAN_TABINFO
ndb/src/ndbapi/NdbApiSignal.cpp:
  Removed SCAN_TABINFO and old comment
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Removed duplicate definition of WAIFOR_SCAN_TIMEOUT, real one is in NdbScanOperation.cpp
ndb/src/ndbapi/NdbScanOperation.cpp:
  Removed duplicate debug printout
ndb/src/ndbapi/Ndbif.cpp:
  Removed SCAN_TABINFO
2004-07-15 09:25:23 +02:00
unknown
e119be8646 Merge o2k.irixworld.net:/usr/people/mysqldev/jonas/my41
into o2k.irixworld.net:/usr/people/mysqldev/jonas/tmp


ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
2004-07-09 12:50:22 +02:00
unknown
01aceaaa15 Irix64 mipspro ndb compile fixes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-09 12:48:32 +02:00
unknown
0785d204f7 Removed some macros
and moved some code.
Improve portability


ndb/include/kernel/signaldata/SignalData.hpp:
  Removed macros
ndb/include/mgmcommon/MgmtErrorReporter.hpp:
  Removed macros
ndb/include/util/Bitmask.hpp:
  Removed macros
ndb/src/common/debugger/SignalLoggerManager.cpp:
  Moved printSegmented to src/kernel/vm
ndb/src/kernel/Main.cpp:
  Removed macros
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Removed macros
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Removed macros
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Removed macros
ndb/src/kernel/blocks/ndbfs/Pool.hpp:
  Removed macros
ndb/src/kernel/error/ErrorReporter.hpp:
  Removed macros
ndb/src/kernel/vm/MetaData.cpp:
  Removed macros
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Removed macros
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Removed macros
ndb/src/kernel/vm/TransporterCallback.cpp:
  Moved printSegmented to src/kernel/vm
ndb/src/mgmclient/CommandInterpreter.cpp:
  Removed macros
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Removed macros
ndb/src/ndbapi/TransporterFacade.cpp:
  Removed macros
2004-07-09 10:00:09 +02:00
unknown
4e41d6497a tux optim 12 - remove max prefix + related 2004-07-08 14:35:19 +02:00
unknown
1cb0e84ae3 wl 1748
ndb/include/kernel/NodeInfo.hpp:
  alligning node numbering
ndb/include/kernel/NodeState.hpp:
  added connected nodes to NodeState
ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  moved to NodeState
ndb/include/mgmapi/mgmapi.h:
  alligning node numbering
ndb/include/mgmapi/mgmapi_config_parameters.h:
  new config port_base param on system
ndb/include/util/Bitmask.hpp:
  POD Bitmask
ndb/include/util/SocketAuthenticator.hpp:
  SocketAut fix
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  added new config param
ndb/src/common/transporter/Transporter.cpp:
  alligning node numbering
ndb/src/common/transporter/TransporterRegistry.cpp:
  alligning node numbering
ndb/src/common/util/SocketAuthenticator.cpp:
  alligning node numbering
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  moved connected nodes to NodeState
ndb/src/mgmsrv/MgmtSrvr.cpp:
  allocation and delallocation of resources in mgmsrvr
  connected bitmask on each node status together with reserved nodes
  that are reserved as long as session is active
  + check that hostname is same as client name
ndb/src/mgmsrv/MgmtSrvr.hpp:
  allocation and delallocation of resources in mgmsrvr
  connected bitmask on each node status together with reserved nodes
  that are reserved as long as session is active
ndb/src/mgmsrv/Services.cpp:
  added destuctor for apisession
ndb/src/mgmsrv/Services.hpp:
  ..
ndb/src/mgmsrv/main.cpp:
  print node id
ndb/src/ndbapi/ClusterMgr.cpp:
  ..
ndb/src/ndbapi/ClusterMgr.hpp:
  ..
2004-06-23 23:53:48 +00:00
unknown
f44c3ee911 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
2004-06-23 00:59:08 +00:00
unknown
dc2544fdee WL 1748
ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  Added info about connected nodes to ApiRegConf
ndb/include/mgmapi/mgmapi.h:
  New mgmapi command to get nodeid dynamically
ndb/include/mgmapi/mgmapi_config_parameters.h:
  New config param to specify port on for transporter setup
ndb/include/mgmcommon/ConfigRetriever.hpp:
  added notetype to getConfig
ndb/include/portlib/NdbTCP.h:
  small detail
ndb/include/transporter/TransporterRegistry.hpp:
  changed performstates and interface to connect/disconnect transporters
  added TransporterService for transporter setup
  changed model for setting up transporters
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  removed some config params as mandatory
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added dynamic alloc of nodeid
ndb/src/common/mgmcommon/LocalConfig.cpp:
  added default localhost:2200 and dynamic id
ndb/src/common/transporter/TCP_Transporter.cpp:
  moved TCP hostname stuff from TCP_Transporter to parent class Transporter
  changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/TCP_Transporter.hpp:
  moved TCP hostname stuff from TCP_Transporter to parent class Transporter
  changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/Transporter.cpp:
  moved TCP hostname stuff from TCP_Transporter to parent class Transporter
  changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/Transporter.hpp:
  moved TCP hostname stuff from TCP_Transporter to parent class Transporter
  changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/TransporterRegistry.cpp:
  changed performstates and interface to connect/disconnect transporters
  added TransporterService for transporter setup
  changed model for setting up transporters
ndb/src/common/util/Makefile.am:
  New SocketAuthenticator
ndb/src/common/util/SocketServer.cpp:
  small detail
ndb/src/kernel/Makefile.am:
  small detail
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  new interface to performstates + cleanup
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  changed signal ApiRegConf
ndb/src/kernel/vm/ThreadConfig.cpp:
  changed naming
ndb/src/mgmapi/mgmapi.cpp:
  Use new Socket client
  New methid for allocating dynamic id
ndb/src/mgmsrv/MgmtSrvr.cpp:
  moved port setup from main.cpp to MgmtSrvr
  new method getNextFreeNodeId
ndb/src/mgmsrv/MgmtSrvr.hpp:
  ..
ndb/src/mgmsrv/Services.cpp:
  allocate new nodeid
ndb/src/mgmsrv/Services.hpp:
  ..
ndb/src/mgmsrv/main.cpp:
  moved setup port to MgmtSrvr.cpp
  Rearranged setup order
ndb/src/ndbapi/ClusterMgr.cpp:
  new API_REGCONF
ndb/src/ndbapi/ClusterMgr.hpp:
  bitmask to hold connected nodes
ndb/src/ndbapi/TransporterFacade.cpp:
  New transporter connect
ndb/src/ndbapi/TransporterFacade.hpp:
  removed function not used
ndb/src/kernel/main.cpp:
  new transporter setup
2004-06-23 00:48:07 +00:00
unknown
8358e07a2e Merge mysql.com:/home/jonas/src/wl1671
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
2004-06-21 01:35:30 +02:00
unknown
df6a7758b2 merge blob code
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
ndb/include/ndbapi/NdbApi.hpp:
  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/Dbtup.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
ndb/test/ndbapi/Makefile_old:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
2004-06-17 14:03:21 +02:00
unknown
41c3dc082c tux optim 7 - use physical TUP address for index entries 2004-06-17 10:03:08 +02:00
unknown
f54dc75075 tux optim 3 - use TUP methods instead of TUP_STORE_TH signal 2004-06-16 16:28:17 +02:00
unknown
eec2835d63 tux optim 2 - use physical TUP address for index nodes 2004-06-16 15:10:13 +02:00