Commit graph

302 commits

Author SHA1 Message Date
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
2f4d0e1e1d wl-1884 storing NULL in ordered index 2004-07-27 13:20:37 +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
cd10133261 NdbSqlUtil.cpp, NdbSqlUtil.hpp:
add NdbSqlUtil::cmp for missing datatypes


ndb/include/util/NdbSqlUtil.hpp:
  add NdbSqlUtil::cmp for missing datatypes
ndb/src/common/util/NdbSqlUtil.cpp:
  add NdbSqlUtil::cmp for missing datatypes
2004-07-27 10:31:10 +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
798e47ceb3 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41
2004-07-08 14:36:11 +02:00
unknown
4e41d6497a tux optim 12 - remove max prefix + related 2004-07-08 14:35:19 +02:00
unknown
abf8c93d80 testIndex -n NFNR1
Bugs in scan(tc)
        nf-handling(api)
        exec-handling(tc)


ndb/include/ndbapi/NdbConnection.hpp:
  Allow dropped signal during NF handling
ndb/include/ndbapi/NdbOperation.hpp:
  Add option to allow dropped signals
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) Printer for state
  2) New option to sendtckeyconf (index)
     - clear exec flag
  3) Moved init of *global* apiConnectptr to
     prevent errornous scan_tabconf
     ARGH!!!
ndb/src/ndbapi/NdbConnection.cpp:
  Move abort from checkState_trans
  since it can be ok with "illegal" signals during NF handling
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Move abort from checkState_trans
  since it can be ok with "illegal" signals during NF handling
ndb/src/ndbapi/Ndbif.cpp:
  1) Indentation
  2) Better handling of TCKEY_FAILCONF
  - always ack commit ack marker
    even if transaction has already been removed
  3) abort on 4012 (VM_TRACE)
ndb/src/ndbapi/TransporterFacade.cpp:
  Don't trace APIREG_REQ/CONF by default
ndb/test/include/NDBT_Test.hpp:
  Atomic decProperty (used for semaphore impl.)
ndb/test/ndbapi/testIndex.cpp:
  Impl. option to sync restarts
ndb/test/src/NDBT_Test.cpp:
  Atomic decProperty
2004-07-07 13:40:53 +02:00
unknown
ca6e7a0ca9 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl1873


ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbResultSet.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testScan.cpp:
  Auto merged
2004-07-06 11:34:26 +02:00
unknown
d0a9676b4a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


mysql-test/ndb/ndbcluster.sh:
  Auto merged
2004-07-06 10:20:52 +02:00
unknown
913424a8ec merge
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2004-07-06 08:56:05 +02:00
unknown
1773595494 Fixed memory handling
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  longable when routed
ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  longable when routed
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Init blob count correctly
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Receiver::init
ndb/src/ndbapi/NdbOperation.cpp:
  Receiver::init
  release memory
2004-07-06 08:36:52 +02:00
unknown
3f3ea3037a Fixed bugs in ordered scan discovered by mysql-test-run
Enabled ordered scan in handler



ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Moved saveBound to NdbIndexScanOperation
ndb/include/ndbapi/NdbScanOperation.hpp:
  Moved saveBound to NdbIndexScanOperation
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Introduced map for
  index attributes (keys) -> real attr id (and back)
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Introduced map for
  index attributes (keys) -> real attr id (and back)
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Moved saveBound to NdbIndexScanOperation
ndb/src/ndbapi/NdbOperationInt.cpp:
  Moved saveBound to NdbIndexScanOperation
ndb/src/ndbapi/NdbScanOperation.cpp:
  Moved saveBound to NdbIndexScanOperation
  Fixed bugs in handling of setBounds w.r.t getValues and index keys
    (use new reverse map)
  Fixed bugs in next_result_ordered
sql/ha_ndbcluster.cc:
  Use sorted scan when requested
2004-07-05 20:41:06 +02:00
unknown
1042c0e86b BUG#4384
ndb/src/common/util/ConfigValues.cpp:
  BUG#4384
  Compute pointers manually instead of using ptr[-x]
  Changed return type from "*&" to "**"
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-05 07:52:20 +02:00
unknown
64c81b9dfd fixed compile of shm transporter
ndb/src/mgmsrv/Services.cpp:
  changed getsockname to getpeername
2004-06-29 14:56:02 +00:00
unknown
e2d3f7b079 several config fixes for ndb, see respective file
ndb/include/debugger/EventLogger.hpp:
  removed unused method
ndb/include/mgmcommon/ConfigRetriever.hpp:
  put NdbMgmHandle in ConfigRetriever to enable holding connection open until setup complete
ndb/include/mgmcommon/NdbConfig.h:
  moved naming of all "ndb" file into NdbConfig.c
ndb/include/ndb_global.h:
  introduced define NDB_BASE_PORT to control default port for ndb
ndb/src/common/debugger/EventLogger.cpp:
  removed unused method
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  introduced define NDB_BASE_PORT to control default port for ndb
  + added setting default Id's on nodes
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  put NdbMgmHandle in ConfigRetriever to enable holding connection open until setup complete
ndb/src/common/mgmcommon/IPCConfig.cpp:
  changed error message
ndb/src/common/mgmcommon/LocalConfig.cpp:
  introduced define NDB_BASE_PORT to control default port for ndb
ndb/src/common/mgmcommon/NdbConfig.c:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/common/transporter/TransporterRegistry.cpp:
  spelling errors
ndb/src/kernel/error/ErrorReporter.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/error/ErrorReporter.hpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/main.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/vm/Configuration.cpp:
  moved allocation of ConfigRetriever object to Configuration to enable holing "config" open until setup finished
ndb/src/kernel/vm/Configuration.hpp:
  moved allocation of ConfigRetriever object to Configuration to enable holing "config" open until setup finished
ndb/src/mgmclient/main.cpp:
  fix default port number
ndb/src/mgmsrv/MgmtSrvr.cpp:
  fix default port
ndb/src/mgmsrv/Services.cpp:
  added spec of transporter in get_nodeid
ndb/src/mgmsrv/main.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/ndbapi/TransporterFacade.cpp:
  moved allocation of ConfigRetriever object to TransporterFacade to enable holing "config" open until setup finished
ndb/src/ndbapi/TransporterFacade.hpp:
  moved allocation of ConfigRetriever object to TransporterFacade to enable holing "config" open until setup finished
2004-06-28 17:29:58 +00:00
unknown
1addcc2ffd wl 1748 2004-06-24 12:18:40 +00: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
6fcaa7d5ac wl1873 impl + test prg
ndb/include/ndbapi/NdbResultSet.hpp:
  NdbResultSet::restart
ndb/include/ndbapi/NdbScanOperation.hpp:
  NdbResultSet::restart
ndb/src/ndbapi/NdbResultSet.cpp:
  NdbResultSet::restart
ndb/src/ndbapi/NdbScanOperation.cpp:
  NdbResultSet::restart
ndb/test/ndbapi/testScan.cpp:
  Test case for scan restart
2004-06-18 23:20:58 +02:00
unknown
28dc842f06 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41
2004-06-18 10:08:12 +02:00
unknown
fb89fac462 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-18 02:16:08 +02:00
unknown
25749c9686 cannot include my_config.h directly, breaks some makes 2004-06-18 00:16:07 +00:00
unknown
6331fd7654 Merge blobs 2004-06-17 23:42:17 +02:00
unknown
41b0444ca8 hpux compile fixes 2004-06-17 21:06:21 +00:00
unknown
6c2e161479 Tru64 fixes 2004-06-17 17:38:05 +00:00
unknown
8979db4182 removed warnings on Tru64 2004-06-17 17:32:03 +00: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
5522ffd35d Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41
2004-06-16 15:31:37 +02:00
unknown
52be66a2c9 Makefile.am:
missing file


ndb/include/Makefile.am:
  missing file
2004-06-16 13:31:35 +00:00
unknown
eec2835d63 tux optim 2 - use physical TUP address for index nodes 2004-06-16 15:10:13 +02:00
unknown
0300c89551 tux optim 1 - use physical fragment addresses 2004-06-16 14:30:49 +02:00
unknown
14979cb59e wl1671 - bug fixes
ndb/include/ndbapi/NdbConnection.hpp:
  Made releaseCompletedOpertions private and introduced
  NdbConnection::restart instead. This methods basically check a bunch of 
  status flags before calling releaseCompletedOperations
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Introduced MARKRE_TRACE
  Fixed bug on not releasing marker at execABORT
ndb/src/ndbapi/NdbConnection.cpp:
  Made releaseCompletedOpertions private and introduced
  NdbConnection::restart instead. This methods basically check a bunch of 
  status flags before calling releaseCompletedOperations
ndb/src/ndbapi/Ndbif.cpp:
  Use MARKER_TRACE
ndb/test/src/HugoTransactions.cpp:
  Use restart instead of releaseCompletedOperations
ndb/test/src/UtilTransactions.cpp:
  Use restart instead of releaseCompletedOperations
ndb/tools/delete_all.cpp:
  Use restart instead of releaseCompletedOperations
2004-06-16 13:27:35 +02:00
unknown
2526a4781b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-blobs
2004-06-14 12:53:14 +02:00
unknown
a9998d1004 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl1671
2004-06-11 17:30:16 +02:00
unknown
48feb97356 Made discless a config parameter instead of a env. variable 2004-06-11 17:29:39 +02:00
unknown
89ba9400c2 BUG#4088 2004-06-11 15:54:46 +02:00
unknown
3e9f47d6b0 Fix handler w.r.t scan
ndb/include/ndbapi/NdbApi.hpp:
  Removed SchemaOp, SchemaCon
ndb/src/ndbapi/NdbRecAttr.cpp:
  merge error
ndb/tools/select_count.cpp:
  clean up
sql/ha_ndbcluster.cc:
  Fixed handler w.r.t scan
sql/ha_ndbcluster.h:
  Fixed handler w.r.t scan
2004-06-11 13:49:22 +02:00
unknown
f9b9bebd4e merge
BitKeeper/deleted/.del-Epilogue.mk~60f7edf886726154:
  Auto merged
BitKeeper/deleted/.del-Makefile_old~1f37e763ba5d06d0:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
ndb/src/kernel/Main.cpp:
  Auto merged
2004-06-11 12:16:03 +02:00
unknown
6ca4b6cd19 BUG#4088 - Multiple mixed index/normal reads
ndb/include/kernel/signaldata/TcKeyConf.hpp:
  BUG#4088 - Multiple mixed index/normal reads
  Make setNoOps "set's" and not only "or's"
2004-06-10 17:26:26 +02:00