Commit graph

447 commits

Author SHA1 Message Date
unknown
51cff67d08 added test for max limit of 128 attributes in table
new define for long signal section size
   bumbed up limit for attributes to 128
    use new define in SectionSegment
    some bug fixing of send fragmented signal +
    make chunk size a multiple the dew define for SectionSegment size


mysql-test/r/ndb_basic.result:
  added test for max limit of 128 attributes in table
mysql-test/t/ndb_basic.test:
  added test for max limit of 128 attributes in table
ndb/include/kernel/ndb_limits.h:
  new define for long signal section size
ndb/include/ndbapi/ndbapi_limits.h:
  bumbed up limit for attributes to 128
ndb/src/kernel/vm/LongSignal.hpp:
  use new define in SectionSegment
ndb/src/ndbapi/TransporterFacade.cpp:
  some bug fixing of send fragmented signal +
  make chunk size a multiple the dew define for SectionSegment size
2004-10-28 11:19:51 +00:00
unknown
b503993058 compilation fix for AIX 2004-10-26 09:48:01 +00:00
unknown
7e39126de8 removed usage of NDB_MUTEX_INITIALIZER 2004-10-25 15:21:49 +00:00
unknown
236e588a73 removing compiler warnings 2004-10-22 16:21:51 +00:00
unknown
27fa5d4853 AIX compile fixes
ndb/include/kernel/signaldata/UpgradeStartup.hpp:
  Forward declaration
ndb/include/ndb_global.h:
  Fix for AIX
ndb/include/ndb_types.h:
  Always use ndb_global instead of my_global (or anything else)
ndb/include/ndbapi/Ndb.hpp:
  Forward declaration
ndb/include/ndbapi/NdbReceiver.hpp:
  Forward declaration
ndb/include/ndbapi/NdbScanOperation.hpp:
  Forward declaration
ndb/src/common/util/ConfigValues.cpp:
  Always use ndb_global instead of my_global (or anything else)
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Forward declaration
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Move read/update function into Dbtup
ndb/src/mgmsrv/SignalQueue.cpp:
  Always use ndb_global instead of my_global (or anything else)
ndb/tools/waiter.cpp:
  Always use ndb_global instead of my_global (or anything else)
2004-10-22 15:13:06 +00:00
unknown
76b09dd518 fix c++ style comments in .h and .c files
compilation problems on some platforms'
2004-10-22 11:59:57 +00:00
unknown
63920158ce changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
unknown
277c84e2b1 some platforms provide posix snprintf via special defined, these defines however cause problems elsewhere
so this is a way to only have to do this define in one file
2004-10-21 16:26:53 +00:00
unknown
3c9d7379e0 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-10-21 11:27:21 +00:00
unknown
1b1ef2ea4c changed to same signature as rest of print functions
provite declarations for signal print functions, needed on some platforms
ome platforms don't like the length calculation for SignalDataPrintFunction
    so null terminate instead
ome platforms complain about this extra level Logger::Logger::
 null terminate SignalDataPrintFunctions instead
    move declaration of print function to SignalData.hpp
  just change from "" to <> in include
 moved double declatration of i out



ndb/include/kernel/signaldata/DihContinueB.hpp:
  changed to same signature as rest of print functions
ndb/include/kernel/signaldata/NdbfsContinueB.hpp:
  changed to same signature as rest of print functions
ndb/include/kernel/signaldata/SignalData.hpp:
  provite declarations for signal print functions, needed on some platforms
ndb/src/common/debugger/DebuggerNames.cpp:
  some platforms don't like the length calculation for SignalDataPrintFunction
  so null terminate instead
ndb/src/common/debugger/EventLogger.cpp:
  some platforms complain about this extra level Logger::Logger::
ndb/src/common/debugger/signaldata/ContinueB.cpp:
  changed to same signature as rest of print functions
ndb/src/common/debugger/signaldata/DihContinueB.cpp:
  changed to same signature as rest of print functions
ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp:
  changed to same signature as rest of print functions
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  null terminate SignalDataPrintFunctions instead
  move declaration of print function to SignalData.hpp
ndb/src/common/portlib/NdbSleep.c:
  just change from "" to <> in include
ndb/src/mgmsrv/Services.cpp:
  moved double declatration of i out
2004-10-21 11:12:15 +00:00
unknown
e4a86f3237 compile warning fixes
mysql-test/ndb/ndbcluster.sh:
  corrected shell test syntax
2004-10-20 13:42:41 +00:00
unknown
9f2fc33f0f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-19 20:25:30 +00:00
unknown
e7e86d20f9 remove possibility of connectstring error like "hostname=..."
+ some fixed string length cleanup
+ fixed a better error printout
2004-10-18 09:37:48 +00:00
unknown
d49b8ac4bb NDB wl-1533 tux optim 17 - allow slack in interior nodes
ndb/include/kernel/ndb_limits.h:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/Times.txt:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/test/ndbapi/testOIBasic.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
2004-10-16 15:44:55 +02:00
unknown
28de5d3607 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-tux


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-10-14 10:38:47 +02:00
unknown
9b027c04c7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


sql/ha_ndbcluster.cc:
  Auto merged
2004-10-13 10:19:28 +02:00
unknown
64ac84fbe2 NDB compile fix sol9x86
ndb/include/kernel/LogLevel.hpp:
  compile fix sol9x86
ndb/include/util/version.h:
  compile fix sol9x86
ndb/src/common/util/version.c:
  compile fix sol9x86
ndb/src/mgmsrv/Services.cpp:
  compile fix sol9x86
2004-10-12 14:07:41 +02:00
unknown
b39bf17844 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-11 11:13:04 +02:00
unknown
011cc5c991 wl1801 - more node failure handling in simple/dirty read
ndb/include/kernel/signaldata/TcContinueB.hpp:
  Test NODE_FAILREP arraving before TCKEYCONF w.r.t simple/dirty read
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Test NODE_FAILREP arraving before TCKEYCONF w.r.t simple/dirty read
ndb/src/ndbapi/NdbConnection.cpp:
  Test NODE_FAILREP arraving before TCKEYCONF w.r.t simple/dirty read
ndb/src/ndbapi/Ndbif.cpp:
  Test NODE_FAILREP arraving before TCKEYCONF w.r.t simple/dirty read
ndb/test/ndbapi/testNodeRestart.cpp:
  Test NODE_FAILREP arraving before TCKEYCONF w.r.t simple/dirty read
2004-10-11 11:02:39 +02:00
unknown
44e30660df wl1801 - Support for handling NF during dirty read
ndb/include/ndbapi/NdbConnection.hpp:
  Support for handling NF during dirty read
ndb/include/ndbapi/NdbReceiver.hpp:
  Support for handling NF during dirty read
ndb/src/ndbapi/NdbConnection.cpp:
  Support for handling NF during dirty read
ndb/src/ndbapi/NdbReceiver.cpp:
  Support for handling NF during dirty read
ndb/src/ndbapi/Ndbif.cpp:
  Support for handling NF during dirty read
ndb/src/ndbapi/ndberror.c:
  Support for handling NF during dirty read
ndb/test/ndbapi/testNodeRestart.cpp:
  Support for handling NF during dirty read
2004-10-11 09:20:04 +02:00
unknown
1b31325e87 Merge
sql/ha_ndbcluster.cc:
  SCCS merged
2004-10-10 18:55:05 +02:00
unknown
a54801eed2 NDB ndb_mgm: fix dump and signal log (more to do)
ndb/include/mgmapi/mgmapi.h:
  ndb_mgm: fix dump and signal log (more to do)
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  ndb_mgm: fix dump and signal log (more to do)
ndb/src/mgmapi/mgmapi.cpp:
  ndb_mgm: fix dump and signal log (more to do)
ndb/src/mgmclient/CommandInterpreter.cpp:
  ndb_mgm: fix dump and signal log (more to do)
2004-10-10 17:38:14 +02:00
unknown
88987f1db3 NDB wl-2151 Fix bounds setting table handler vs TUX
mysql-test/ndb/ndb_range_bounds.pl:
  wl-2151 Fix bounds setting table handler vs TUX
ndb/include/kernel/signaldata/TuxBound.hpp:
  wl-2151 Fix bounds setting table handler vs TUX
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  wl-2151 Fix bounds setting table handler vs TUX
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  wl-2151 Fix bounds setting table handler vs TUX
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  wl-2151 Fix bounds setting table handler vs TUX
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-2151 Fix bounds setting table handler vs TUX
ndb/test/ndbapi/testOIBasic.cpp:
  wl-2151 Fix bounds setting table handler vs TUX
sql/ha_ndbcluster.cc:
  wl-2151 Fix bounds setting table handler vs TUX
sql/ha_ndbcluster.h:
  wl-2151 Fix bounds setting table handler vs TUX
2004-10-08 10:50:50 +02:00
unknown
c74e8a6262 Fix simple/dirty read handling
ndb/include/kernel/signaldata/TcKeyConf.hpp:
  A bit for differenciating between "real" tckey conf and simple read conf
ndb/include/ndbapi/Ndb.hpp:
  Removed/ifdef's unused stuff
ndb/include/ndbapi/NdbConnection.hpp:
  Added bitmask that keeps track of used nodes when
    a transaction can be dependant on several nodes
ndb/include/ndbapi/NdbOperation.hpp:
  removed unused methods
ndb/include/ndbapi/NdbReceiver.hpp:
  Tween execTCOPCONF to handle TcKeyConf::SimpleReadBit
ndb/src/common/debugger/signaldata/TcKeyConf.cpp:
  Update printer
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  removed unused define
ndb/src/ndbapi/NdbApiSignal.cpp:
  Fix length of TC_COMMITREQ
ndb/test/ndbapi/testOperations.cpp:
  fix simple/dirty read
2004-10-08 09:43:38 +02:00
unknown
7a8336bef5 wl2135 - index restart
mysql-test/r/ndb_index_ordered.result:
  test case
mysql-test/t/ndb_index_ordered.test:
  test case
ndb/include/kernel/signaldata/ScanTab.hpp:
  Split exclusive/keyinfo
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Add possibility retreive sorted flag
ndb/include/ndbapi/NdbOperation.hpp:
  Add possibility retreive lock mode
ndb/include/ndbapi/NdbResultSet.hpp:
  Add possibility to get operation
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Split exclusive/keyinfo
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Store flags in ScanFragReq::requestInfo format
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Store flags in ScanFragReq::requestInfo format
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Keep theLockMode up-to-date
ndb/src/ndbapi/NdbScanOperation.cpp:
  Keep theLockMode up-to-date
sql/ha_ndbcluster.cc:
  Use NdbIndexScanOperation::reset_bounds when
    performing second index access
2004-10-05 12:17:42 +02:00
unknown
7cf1c4d59e wl2135 test prg + bug fixes
ndb/include/ndbapi/NdbConnection.hpp:
  Add support for removing op from list
ndb/include/ndbapi/NdbScanOperation.hpp:
  virtual destructor
ndb/src/ndbapi/NdbConnection.cpp:
  Add support for removing op from list
ndb/src/ndbapi/NdbScanOperation.cpp:
  Set magic number to invalid before first prepareSendScan
  (so that prepareSendScan is only called once incase of restarts)
ndb/src/ndbapi/Ndblist.cpp:
  Use correct type
ndb/test/src/UtilTransactions.cpp:
  Update test prg.
  - use LM_Read to maintain locks
  - set iop = null on temporary error (restart transaction)
2004-10-05 09:01:22 +02:00
unknown
d7885b5e3f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
2004-10-04 13:02:16 +02:00
unknown
499ebf4d41 NdbIndexScanOperation::reset_bounds()
- Send BOUNDS as KEYINFO
- At restart, only reset KEYINFO

--
Fix resource shortage at KEYINFO in Dbtc and Dblqh w.r.t scan
--


ndb/include/kernel/signaldata/AttrInfo.hpp:
  Let NdbScanOperation access AttrInfo
ndb/include/kernel/signaldata/KeyInfo.hpp:
  Let NdbScanOperation access AttrInfo
ndb/include/kernel/signaldata/ScanFrag.hpp:
  Send KeyLen in ScanFragReq (for range scans)
ndb/include/kernel/signaldata/ScanTab.hpp:
  Send KeyLen in ScanTabReq (for range scans)
ndb/include/ndbapi/NdbConnection.hpp:
  Function for adding op to list
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  new method for saving BOUNDS
ndb/include/ndbapi/NdbOperation.hpp:
  Remove bounds stuff from NdbOperation and put it into NdbScanOperation
ndb/include/ndbapi/NdbScanOperation.hpp:
  reset bounds
ndb/src/common/debugger/signaldata/Makefile.am:
  New signal data printer for ScanFrag
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Fix printout
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  New signal data printer for ScanFrag
ndb/src/kernel/blocks/backup/Backup.cpp:
  Updated ScanFragReq
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Use same sendKeyInfo for both acckeyreq and tux_bounds
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Let range scan use KEYinfo for bounds instead of attrinfo
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Let range scan use KEYinfo for bounds instead of attrinfo
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle keyinfo in range scan
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Skip useless 5 words in beginning of TuxBounds
ndb/src/kernel/blocks/suma/Suma.cpp:
  Fix SCAN_FRAGREQ
ndb/src/ndbapi/NdbConnection.cpp:
  reset bounds
ndb/src/ndbapi/NdbOperation.cpp:
  Remove bounds
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Remove bounds stuff
ndb/src/ndbapi/NdbOperationInt.cpp:
  Remove bounds stuff
ndb/src/ndbapi/NdbScanOperation.cpp:
  Send BOUNDS in KEYINFO instead of ATTRINFO
2004-10-04 12:59:04 +02:00
unknown
77fd668ef4 addes auto pointer class for using with my_ functions
switch to using my_ for heap allocations


ndb/include/util/NdbAutoPtr.hpp:
  addes auto pointer class for using with my_ functions
ndb/src/mgmclient/CommandInterpreter.cpp:
  switch to using my_ for heap allocations
2004-10-04 06:58:33 +00:00
unknown
f6f7af7a70 Merge fixes
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge: ndb_discover_tables should no longer be called when server is starting
2004-09-30 16:12:28 +02:00
unknown
e8c4af1293 set correct lockmode in all reads...
move lockmode from scan operation to operation
    added read tuple with lock mode


ndb/include/ndbapi/NdbIndexOperation.hpp:
  added read tuple with lock mode
ndb/include/ndbapi/NdbOperation.hpp:
  move lockmode from scan operation to operation
ndb/include/ndbapi/NdbScanOperation.hpp:
  move lockmode from scan operation to operation
ndb/src/ndbapi/NdbIndexOperation.cpp:
  added read tuple with lock mode
ndb/src/ndbapi/NdbOperationDefine.cpp:
  added read tuple with lock mode
sql/ha_ndbcluster.cc:
  set correct lockmode in all reads...
  moved lockmode from scan operatoin to operation
2004-09-28 17:35:07 +00:00
unknown
a6b64d2898 removed init on ConfigRetriever
added some debug printouts
    some changes in ndbcluster_init to make start of mysqld first work


ndb/include/mgmcommon/ConfigRetriever.hpp:
  removed init on ConfigRetriever
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  removed init on ConfigRetriever
  added some debug printouts
ndb/src/kernel/vm/Configuration.cpp:
  removed init on ConfigRetriever
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  removed init on ConfigRetriever
  added sleep in retry
sql/ha_ndbcluster.cc:
  some changes in ndbcluster_init to make start of mysqld first work
2004-09-27 00:24:23 +00:00
unknown
1dd76e1931 Merge
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged
2004-09-26 16:21:15 +02:00
unknown
7a2cb204ed added printout for where configuration is fetched
debug printouts


mysql-test/ndb/ndbcluster.sh:
  .
ndb/include/mgmcommon/ConfigRetriever.hpp:
  added printout for where configuration is fetched
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added printout for where configuration is fetched
ndb/src/kernel/main.cpp:
  added printout for where configuration is fetched
ndb/src/kernel/vm/Configuration.cpp:
  added printout for where configuration is fetched
ndb/src/kernel/vm/Configuration.hpp:
  added printout for where configuration is fetched
ndb/src/ndbapi/Ndb.cpp:
  debug printouts
2004-09-25 16:06:30 +00:00
unknown
1bf19b822d moved LocalConfig out of config retriver 2004-09-25 14:10:06 +00:00
unknown
892b5c9bca Fix memory leak
BitKeeper/deleted/.del-NdbScanReceiver.hpp~5c295814a47e7bb4:
  Delete: ndb/src/ndbapi/NdbScanReceiver.hpp
BitKeeper/deleted/.del-NdbScanReceiver.cpp~b8a7472e4a7c424f:
  Delete: ndb/src/ndbapi/NdbScanReceiver.cpp
ndb/include/ndb_global.h:
  Added ndb_end (corresponding to ndb_init)
ndb/src/common/util/ndb_init.c:
  Added ndb_end (corresponding to ndb_init)
ndb/src/ndbapi/NdbScanOperation.cpp:
  Release SCAN_TABREQ and 
  make sure to call NdbOperation::release (that releases other stuff)
ndb/src/ndbapi/Ndbinit.cpp:
  Reorder free-ing so that signal are release last
  (so that operations holding signals can release the first)
2004-09-25 10:16:37 +02:00
unknown
0094f7e4ec config parameter changed 2004-09-21 17:31:01 +00:00
unknown
52b75a65fe Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
2004-09-20 17:32:40 +02:00
unknown
bdbb091b68 Merged Thd_ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2004-09-20 14:28:43 +02:00
unknown
dbf87bf899 Hand merge
acinclude.m4:
  Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2004-09-20 14:20:01 +02:00
unknown
ef5c6152c3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-17 16:58:10 +02:00
unknown
32e8f2ac95 New mgmapi call - ndb_mtm_listen_event 2004-09-17 15:11:57 +02:00
unknown
a7a6d09e9b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-cc
2004-09-17 14:18:32 +02:00
unknown
e8c9a13769 Fix backup event 2004-09-17 14:18:28 +02:00
unknown
72fedd9494 ndb charsets (wl-1732) final part: use strxfrm + strcoll
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  oops
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  jamEntry
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  jamEntry
mysql-test/r/ndb_index.result:
  ndb charsets: minimal fix to make test pass
mysql-test/t/ndb_index.test:
  ndb charsets: minimal fix to make test pass
2004-09-17 14:09:21 +02:00
unknown
3323469dbd 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/MgmtSrvr.cpp:
  Auto merged
2004-09-17 12:06:23 +02:00
unknown
e44bcce123 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2004-09-17 10:06:22 +00:00
unknown
034bbee322 made tryBind static
using tryBind instead to determine if we're "config host" is "local"


ndb/include/util/SocketServer.hpp:
  made tryBind static
ndb/src/common/util/SocketServer.cpp:
  made tryBind static
ndb/src/mgmsrv/MgmtSrvr.cpp:
  using tryBind instead to determine if we're "config host" is "local"
2004-09-17 10:05:42 +00:00
unknown
f53bc339ff Added EventReport for backup
ndb/src/mgmsrv/MgmtSrvr.cpp:
  removed useless code
ndb/src/mgmsrv/MgmtSrvr.hpp:
  removed useless code
2004-09-17 10:32:22 +02:00
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