Commit graph

353 commits

Author SHA1 Message Date
unknown
21f9f4f210 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-22 06:22:41 +01:00
unknown
a5108fc1d4 bug#7466 - ndb - bitfields of size 0 is unsupported
ndb/include/kernel/signaldata/CreateTable.hpp:
  Check array size in dict before creating table
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Check array size in dict before creating table
ndb/src/ndbapi/ndberror.c:
  Check array size in dict before creating table
2004-12-22 06:19:19 +01:00
unknown
1d32cbb198 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
2004-12-21 13:22:46 +01:00
unknown
b58224a54f Updated docs 2004-12-21 13:21:59 +01:00
unknown
3465e155a2 ndb: wl-1893: range scanning backwards, ndb kernel
ndb/include/kernel/signaldata/AccScan.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/kernel/signaldata/ScanFrag.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/kernel/signaldata/ScanTab.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/ndbapi/NdbScanOperation.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/ndbapi/NdbScanOperation.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/tools/select_all.cpp:
  wl-1893: range scanning backwards, ndb kernel
sql/ha_ndbcluster.cc:
  wl-1893: range scanning backwards, ndb kernel
2004-12-17 10:20:18 +01:00
unknown
755874c80f ndb: small fixes (error codes, debug stuff)
ndb/test/ndbapi/testDeadlock.cpp:
  for broken compilers
sql/ha_ndbcluster.cc:
  Use DBUG_PRINT since DBUG_FILE cannot be filtered out
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  missing DBUG_RETURN
ndb/include/kernel/signaldata/TupFrag.hpp:
  fix some error codes
ndb/include/kernel/signaldata/TuxMaint.hpp:
  fix some error codes
ndb/include/ndbapi/NdbBlob.hpp:
  fix some error codes
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  fix some error codes
ndb/src/ndbapi/ndberror.c:
  fix some error codes
2004-12-17 09:01:54 +01:00
unknown
ff51fe45d3 merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
ndb/include/Makefile.am:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.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/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  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/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.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/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
2004-12-16 22:42:27 +01:00
unknown
80c1bddd1b merge
ndb/include/transporter/TransporterRegistry.hpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
2004-12-16 21:55:50 +01:00
unknown
1fefa5b3b4 wl2240 - fix handling of distribution key wrt unique indexes
ndb/include/kernel/AttributeDescriptor.hpp:
  removed unused
ndb/include/kernel/ndb_limits.h:
  removed unused
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Differentiate between nullable columns and null fields
    TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Differentiate between nullable columns and null fields
    TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Handle distribution key and collation in same subroutine
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle distribution key and collation in same subroutine
ndb/src/kernel/vm/VMSignal.hpp:
  Increase size of signal->theData to 32k
ndb/test/ndbapi/testPartitioning.cpp:
  better usage
2004-12-16 21:47:37 +01:00
unknown
ae971ecd97 Merge
ndb/include/kernel/AttributeHeader.hpp:
  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/DbtupRoutines.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/include/HugoOperations.hpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/src/HugoOperations.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
ndb/test/src/UtilTransactions.cpp:
  Auto merged
ndb/tools/select_count.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  SCCS merged
ndb/src/ndbapi/NdbDictionary.cpp:
  SCCS merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  SCCS merged
2004-12-15 13:12:54 +01:00
unknown
3f89a4f362 ndb - major update HugoOperations/Transactions
+more code reuse
     +easier testing of indexes


ndb/include/ndbapi/NdbDictionary.hpp:
  Remove unimplemented enums
ndb/test/include/HugoOperations.hpp:
  Pass index on constructor
ndb/test/include/HugoTransactions.hpp:
  Pass index on constructor
ndb/test/include/UtilTransactions.hpp:
  Pass index on constructor
ndb/test/src/HugoAsynchTransactions.cpp:
  Pass index on constructor
ndb/test/src/HugoOperations.cpp:
  Use getOperation to select operation type
ndb/test/src/HugoTransactions.cpp:
  Use HugoOpertaions to run transactions
ndb/test/src/UtilTransactions.cpp:
  Use HugoOpertaions to run transactions
2004-12-14 22:30:33 +01:00
unknown
253dab847d wl2240 - ndb partitioning,
fix scan take over


ndb/include/kernel/AttributeDescriptor.hpp:
  remove deprecated bits
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/kernel/vm/MetaData.hpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/ndbapi/NdbScanOperation.cpp:
  Do scan take over via distribution key code
2004-12-14 10:58:29 +01:00
unknown
249772a2d1 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-14 08:27:42 +01:00
unknown
ebee4cfad3 ndb - fix protection wrt shm
ndb/include/transporter/TransporterRegistry.hpp:
  fix protection
2004-12-14 08:26:53 +01:00
unknown
f6296657ff merge
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
2004-12-14 08:16:48 +01:00
unknown
7e7a2b32e8 ndb - shm transporter benchmark result
ndb/docs/wl2077.txt:
  Add result from micro benchmark with shm-transporter
ndb/include/transporter/TransporterRegistry.hpp:
  Move pid into transporter registry
ndb/src/common/transporter/SHM_Transporter.cpp:
  Move pid into transporter registry
ndb/src/common/transporter/TransporterRegistry.cpp:
  Move pid into transporter registry
ndb/src/kernel/main.cpp:
  Move pid into transporter registry
ndb/src/ndbapi/TransporterFacade.cpp:
  Move pid into transporter registry
2004-12-14 08:10:22 +01:00
unknown
a7fe1c3933 ndb: wl-1732 support all charsets
ndb/include/kernel/AttributeDescriptor.hpp:
  wl-1732 support all charsets
ndb/include/kernel/ndb_limits.h:
  wl-1732 support all charsets
ndb/include/kernel/signaldata/TuxBound.hpp:
  wl-1732 support all charsets
ndb/include/util/NdbSqlUtil.hpp:
  wl-1732 support all charsets
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationDefine.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationSearch.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbScanOperation.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/ndberror.c:
  wl-1732 support all charsets
ndb/test/ndbapi/Makefile.am:
  wl-1732 support all charsets
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1732 support all charsets
ndb/tools/desc.cpp:
  wl-1732 support all charsets
2004-12-12 18:37:36 +01:00
unknown
0773520842 ndb - bitfields - more tests, now passes all api tests!!
ndb/include/kernel/ndb_limits.h:
  #define for max null bits
ndb/include/kernel/signaldata/TupFrag.hpp:
  Error code for too many nullbits
ndb/include/util/Bitmask.hpp:
  Cosmetic fix
ndb/src/common/util/Bitmask.cpp:
  handle (pos % 32) == 0
  more unit tests
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Check bitmask overflow
ndb/src/ndbapi/ndberror.c:
  New error code
ndb/test/ndbapi/testBitfield.cpp:
  Update test program
ndb/test/run-test/daily-basic-tests.txt:
  Add testBitfield to autotest
2004-12-10 16:15:36 +01:00
unknown
4cf675a21d ndb - Fix printout/bugs for bit column
ndb/include/kernel/AttributeHeader.hpp:
  Add pseudo column for row size
ndb/include/ndbapi/NdbDictionary.hpp:
  Add pseudo column for row size
ndb/include/util/Bitmask.hpp:
  Remove assert which was not needed
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Missing break
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  1) New pseudo column ROW_SIZE
  2) Fix bug in Bit columns
ndb/src/ndbapi/NdbDictionary.cpp:
  Fix prinout of bit column
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Bug fix Bit column
ndb/src/ndbapi/NdbRecAttr.cpp:
  Fix prinout of bit column
ndb/test/src/HugoCalculator.cpp:
  Bit enable Hugo
ndb/test/src/HugoOperations.cpp:
  Bit enable Hugo
ndb/test/src/NDBT_Tables.cpp:
  Bit enable Hugo
2004-12-09 16:19:24 +01:00
unknown
c43c904fa5 ndb - Fixed bitfields of upto 31 bits
ndb/include/util/Bitmask.hpp:
  Fixed bitfields of upto 31 bits
ndb/src/common/util/Bitmask.cpp:
  Fixed bitfields of upto 31 bits
2004-12-08 17:58:00 +01:00
unknown
78a4cebee8 Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/wl2126


sql/ha_ndbcluster.cc:
  Auto merged
2004-12-08 00:50:47 +01:00
unknown
34b97fc361 wl2126 - ndb - bug fixes
ndb/include/Makefile.am:
  remove result set
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix so that noOfFiredTriggers aren't overwritten during scans
sql/ha_ndbcluster.cc:
  1) Fix bugs in completed read_multi_range
  2) Change buffer handling so range scan are always put last in buffer
     This to support restart of scan
sql/ha_ndbcluster.h:
  1) Fix bugs in completed read_multi_range
  2) Change buffer handling so range scan are always put last in buffer
     This to support restart of scan
2004-12-08 00:36:40 +01:00
unknown
7bf034be35 ndb - Test program for new bitmask functions
ndb/include/util/Bitmask.hpp:
  Add general set/getField
ndb/src/common/util/Bitmask.cpp:
  Test program for bitmask
ndb/src/common/util/Makefile.am:
  Test program for bitmask
2004-12-07 20:58:46 +01:00
unknown
2cae258f75 wl2126 - ndb - fix last unhandled part of read_multi_range
reading sorted multi_range with several range-scans


BitKeeper/deleted/.del-NdbResultSet.hpp~e0042f4c18088ff6:
  Delete: ndb/include/ndbapi/NdbResultSet.hpp
BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
  Delete: ndb/src/ndbapi/NdbResultSet.cpp
ndb/include/ndbapi/NdbApi.hpp:
  Remove NdbResultSet
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Remove NdbResultSet
ndb/include/ndbapi/NdbScanOperation.hpp:
  Remove NdbResultSet
ndb/src/ndbapi/Makefile.am:
  Remove NdbResultSet
ndb/src/ndbapi/NdbConnection.cpp:
  Remove NdbResultSet
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Remove NdbResultSet
ndb/src/ndbapi/NdbScanOperation.cpp:
  Remove NdbResultSet
ndb/test/include/HugoOperations.hpp:
  Remove NdbResultSet
ndb/test/ndbapi/ScanFunctions.hpp:
  Remove NdbResultSet
ndb/test/ndbapi/ScanInterpretTest.hpp:
  Remove NdbResultSet
ndb/test/ndbapi/bank/Bank.cpp:
  Remove NdbResultSet
ndb/test/ndbapi/bank/BankLoad.cpp:
  Remove NdbResultSet
ndb/test/ndbapi/slow_select.cpp:
  Remove NdbResultSet
ndb/test/ndbapi/testBlobs.cpp:
  Remove NdbResultSet
ndb/test/ndbapi/testDataBuffers.cpp:
  Remove NdbResultSet
ndb/test/ndbapi/testDeadlock.cpp:
  Remove NdbResultSet
ndb/test/ndbapi/testIndex.cpp:
  Remove NdbResultSet
ndb/test/ndbapi/testOIBasic.cpp:
  Remove NdbResultSet
ndb/test/ndbapi/testReadPerf.cpp:
  Remove NdbResultSet
ndb/test/ndbapi/testScan.cpp:
  Remove NdbResultSet
ndb/test/ndbapi/testScanPerf.cpp:
  Remove NdbResultSet
ndb/test/src/HugoOperations.cpp:
  Remove NdbResultSet
ndb/test/src/HugoTransactions.cpp:
  Remove NdbResultSet
ndb/test/src/UtilTransactions.cpp:
  Remove NdbResultSet
ndb/tools/delete_all.cpp:
  Remove NdbResultSet
ndb/tools/select_all.cpp:
  Remove NdbResultSet
ndb/tools/select_count.cpp:
  Remove NdbResultSet
sql/ha_ndbcluster.cc:
  1) Fix a = 3 -> a= 3
  2) Impl. last part of wl2126
     ordered "multi ordered scan"
2004-12-07 15:15:49 +01:00
unknown
a01f06864b Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/wl2126


ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
2004-12-07 08:39:59 +01:00
unknown
bf0b3493d6 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl1744


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
ndb/include/Makefile.am:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  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/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-12-06 14:52:31 +01:00
unknown
9a71f575c7 ndb - Use BitmaskImpl in TUP (in BitField operations)
ndb/include/util/Bitmask.hpp:
  New methods for working with bit fields of
    arbitrary size
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Use BitmaskImpl at all time (in BitField operations)
2004-12-06 12:31:17 +01:00
unknown
7fe02a224c Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/wl2126


ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-12-06 09:29:36 +01:00
unknown
7f510bccf3 wl2126 - ndb - set correct found_p using new pseudo column NDB$RANGE_NO
ndb/include/kernel/AttributeHeader.hpp:
  Added range_no pseudo column
ndb/include/ndbapi/NdbDictionary.hpp:
  Added range_no pseudo column
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Add support for reading range_no
ndb/include/ndbapi/NdbReceiver.hpp:
  Add support for reading range_no
ndb/include/ndbapi/NdbScanOperation.hpp:
  Add support for reading range_no
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Added range_no pseudo column
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Added range_no pseudo column
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Added range_no pseudo column
ndb/src/ndbapi/NdbDictionary.cpp:
  Added range_no pseudo column
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Added range_no pseudo column
ndb/src/ndbapi/NdbReceiver.cpp:
  Add support for reading range_no
ndb/src/ndbapi/NdbScanOperation.cpp:
  Read range no
sql/ha_ndbcluster.cc:
  Set correct found_p using new feature read_range_no
sql/ha_ndbcluster.h:
  Set correct found_p using new feature read_range_no
2004-12-06 09:05:30 +01:00
unknown
ed50774403 Add general n-bitfields to ndb storage engine
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Add bit type
  ArraySize is used to specify no of bits
ndb/include/ndbapi/NdbDictionary.hpp:
  Add bit type
ndb/include/util/NdbSqlUtil.hpp:
  Add bit type
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Add bit type
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add bit type
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Add bit type
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Add bit type
2004-12-05 19:48:15 +01:00
unknown
99880af843 wl#2126 - ndb - Fix handling of null values wrt read multi range
mysql-test/r/ndb_read_multi_range.result:
  Add tests of null handling to read_multi
mysql-test/t/ndb_read_multi_range.test:
  Add tests of null handling to read_multi
ndb/include/ndbapi/NdbOperation.hpp:
  Get recattr
ndb/include/ndbapi/NdbRecAttr.hpp:
  Get recattr
sql/ha_ndbcluster.cc:
  Fix handling of null values wrt read multi range
sql/ha_ndbcluster.h:
  Fix handling of null values wrt read multi range
2004-12-01 12:43:30 +01:00
unknown
9ada34b316 Merge for Matt for Innodb bug.
client/mysqldump.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_grant.later:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/my_print_defaults.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
client/mysqladmin.cc:
  Merge for Netware changes. Indention fixes.
sql/field.cc:
  Merge fixes, warnings added from 4.1 to 5.0
sql/mysqld.cc:
  Merge fixes, just indention fixes.
2004-11-30 10:10:40 -08:00
unknown
be733ad13f fixed error in test result
added extra calls to retrieve connectstring used
    reengineered connect somewhat to make retries etc explicit


mysql-test/r/ndb_index_unique.result:
  fixed error in test result
ndb/include/mgmapi/mgmapi.h:
  added extra calls to retrieve connectstring used
ndb/include/mgmcommon/ConfigRetriever.hpp:
  added extra calls to retrieve connectstring used
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added extra calls to retrieve connectstring used
ndb/src/mgmapi/mgmapi.cpp:
  added extra calls to retrieve connectstring used
ndb/src/mgmclient/CommandInterpreter.cpp:
  moved parse of quit to avoid connect before
ndb/src/ndbapi/Ndbinit.cpp:
  reengineered connect somewhat to make retries etc explicit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
ndb/tools/listTables.cpp:
  reengineered connect somewhat to make retries etc explicit
sql/ha_ndbcluster.cc:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
2004-11-30 17:47:47 +00:00
unknown
07ed8294fa added check connection mgmapi method
added ndb_mgm_check_connection when error is printed


ndb/include/mgmapi/mgmapi.h:
  added check connection mgmapi method
ndb/src/mgmapi/mgmapi.cpp:
  added check connection mgmapi method
ndb/src/mgmclient/CommandInterpreter.cpp:
  added mgm_check_check_connection when error is printed
ndb/src/mgmsrv/Services.cpp:
  added check connection mgmapi method
ndb/src/mgmsrv/Services.hpp:
  added check connection mgmapi method
2004-11-30 12:02:53 +00:00
unknown
ef3d635db1 wl2126 - ndb batch - post review fixes
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  renamed set_new_bound to end_of_bound
ndb/src/ndbapi/NdbIndexOperation.cpp:
  remove code for TCINDXREF
ndb/src/ndbapi/NdbScanOperation.cpp:
  renamed methods
ndb/test/ndbapi/testScanPerf.cpp:
  renamed method
sql/ha_ndbcluster.cc:
  renamed method
  add lots of comments
2004-11-30 07:58:55 +01:00
unknown
905db4984b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-29 15:19:08 +00:00
unknown
3d3ad211d8 aligned backup errorcodes with rest of ndb error codes giving it range from 1300
added new error type "configuration or application error"
    Added check if backup is issued during diskless mode, backup refuse returned
    added possibility to get error code as a result from management client
    addded possibility to set connecstring with CONNECT command
    changed to use strcasecmp instead of strcmp
    added possibility to run one command on cammand client to ndb_mgm and get an errorcode of command fails
    made thread safe veriosn of getErrorText in management server
    aligned backup errorcodes with rest of ndb error codes giving it range from 1300
    print error message from regular ndberror struct
    added new arrer type "cofiguration or application error"
    commented on allocaded ranges for errors


ndb/include/kernel/signaldata/BackupImpl.hpp:
  aligned backup errorcodes with rest of ndb error codes giving it range from 1300
ndb/include/kernel/signaldata/BackupSignalData.hpp:
  aligned backup errorcodes with rest of ndb error codes giving it range from 1300
ndb/include/ndbapi/ndberror.h:
  added new error type "configuration or application error"
ndb/src/kernel/blocks/backup/Backup.cpp:
  Added check if backup is issued during diskless mode, backup refuse returned
ndb/src/kernel/blocks/backup/Backup.hpp:
  member variable in backup block to indicate diskless or not
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Added check if backup is issued during diskless mode, backup refuse returned
ndb/src/mgmclient/CommandInterpreter.cpp:
  added possibility to get error code as a result from management client
  addded possibility to set connecstring with CONNECT command
  changed to use strcasecmp instead of strcmp
ndb/src/mgmclient/main.cpp:
  added possibility to run one command on cammand client to ndb_mgm and get an errorcode of command fails
ndb/src/mgmclient/ndb_mgmclient.hpp:
  added possibility to get error code as a result from management client
ndb/src/mgmsrv/CommandInterpreter.cpp:
  made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/CommandInterpreter.hpp:
  made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/MgmtSrvr.cpp:
  aligned backup errorcodes with rest of ndb error codes giving it range from 1300
  print error message from regular ndberror struct
ndb/src/mgmsrv/MgmtSrvr.hpp:
  made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/Services.cpp:
  made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/Services.hpp:
  made thread safe veriosn of getErrorText in management server
ndb/src/ndbapi/ndberror.c:
  added new arrer type "cofiguration or application error"
  commented on allocaded ranges for errors
  aligned backup errors with rest of errors
2004-11-29 15:14:43 +00:00
unknown
48e5008576 wl2126 ndb read_multi_range - bugfixes + more tests
mysql-test/r/ndb_read_multi_range.result:
  add order by tests + mixed ranges
mysql-test/t/ndb_read_multi_range.test:
  add order by tests + mixed ranges
ndb/include/kernel/signaldata/TcIndx.hpp:
  removed TcIndxRef (use TcKeyRef instead)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  removed TcIndxRef (use TcKeyRef instead)
ndb/src/ndbapi/NdbIndexOperation.cpp:
  removed TcIndxRef (use TcKeyRef instead)
sql/ha_ndbcluster.cc:
  bug fixes in batched ranged access (when ordered)
2004-11-29 13:50:13 +01:00
unknown
a26737a015 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/wl2126
2004-11-29 09:42:29 +01:00
unknown
98cbdf4e21 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-11-29 09:28:23 +01:00
unknown
40a473d35c Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1


ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-11-29 09:17:45 +01:00
unknown
d212891f6f ndb - scan bug fix + more test cases
ndb/include/ndbapi/NdbScanOperation.hpp:
  Improved doc. a bit
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Set error code
ndb/src/ndbapi/NdbScanOperation.cpp:
  Check error directly after taking mutex
ndb/test/ndbapi/testScan.cpp:
  new scan test with lots of threads
ndb/test/run-test/daily-basic-tests.txt:
  Added two more scan tests
  Collapsed testTransactions & testOperations
2004-11-29 09:00:39 +01:00
unknown
e6493ba911 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/wl2126


ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-11-25 14:30:15 +00:00
unknown
d45ee63e25 merge
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/common/util/version.c:
  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/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
2004-11-25 14:33:33 +01:00
unknown
dcdbad0791 Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/wl2126


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-11-25 10:51:57 +01:00
unknown
15edb7fc15 added mgmapi/mgmapi_config_parameters.h, mgmapi/mgmapi_config_parameters_debug.h
to distribution
2004-11-24 13:59:03 +00:00
unknown
e7d6805912 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
2004-11-24 12:40:04 +01:00
unknown
8998e128b6 Merge mysql.com:/home/jonas/src/wl2077
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
2004-11-24 11:59:06 +01:00
unknown
4607570413 wl2126 - ndb - add support for batching range scans
1) removed acc keyinfo
2) introduce handling of multiple bounds


ndb/include/kernel/signaldata/AccScan.hpp:
  Removed keyinfo from AccScan
ndb/include/kernel/signaldata/TuxBound.hpp:
  Add data word
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Added new_bound call, which is used when batching range scans
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  removed keyinfo from acc scan
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  removed scan keyinfo
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  removed scan keyinfo
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  1) removed add scan,
     let LQH read keyinfo from tup instead
  2) introduce copy_bounds which handles multiple bounds
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  removed scan keyinfo
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  removed scan keyinfo
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  removed scan keyinfo
ndb/src/ndbapi/NdbScanOperation.cpp:
  handle multiple bounds
2004-11-23 22:08:47 +01:00
unknown
f74af1b7cb ndb: fix blob performance in long transactions
ndb/include/ndbapi/NdbConnection.hpp:
  fix blob performance in long transactions
ndb/src/ndbapi/NdbConnection.cpp:
  fix blob performance in long transactions
ndb/test/ndbapi/testBlobs.cpp:
  fix blob performance in long transactions
2004-11-22 18:54:06 +01:00