Commit graph

20 commits

Author SHA1 Message Date
unknown
91a3e90baf ndb - wl-1442 merge fix 5.0 -> 5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 merge fix 5.0 -> 5.0-ndb
2005-01-09 01:14:11 +01:00
unknown
f029af067b Merge
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndb_constants.h:
  merge 5.0->5.0-ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge 5.0->5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  merge 5.0->5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  merge 5.0->5.0-ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  merge 5.0->5.0-ndb
2005-01-09 00:45:06 +01:00
unknown
09a4872661 ndb - wl-1442 4.1->5.0 merge fixes
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/include/ndb_constants.h:
  wl-1442 4.1->5.0 merge fixes
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 4.1->5.0 merge fixes
2005-01-08 23:24:25 +01:00
unknown
2c12921a64 Merge
client/mysql.cc:
  Auto merged
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge
2005-01-08 22:34:16 +01:00
unknown
3186b340da ndb - wl-1442 fix Time ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Time.  adds new type id 25
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Time.  adds new type id 25
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Time.  adds new type id 25
sql/ha_ndbcluster.cc:
  wl-1442 fix Time.  adds new type id 25
2005-01-08 19:28:44 +01:00
unknown
633ee9b099 ndb - wl-1442 fix Date ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Date.  reuses old unused Timespec type id
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
sql/ha_ndbcluster.cc:
  wl-1442 fix Date.  reuses old unused Timespec type id
2005-01-08 16:57:51 +01:00
unknown
2331344909 ndb - wl-1442 new varchar
mysql-test/r/ndb_alter_table.result:
  wl-1442 new varchar
mysql-test/r/ndb_bitfield.result:
  wl-1442 new varchar
mysql-test/r/ndb_charset.result:
  wl-1442 new varchar
mysql-test/t/ndb_charset.test:
  wl-1442 new varchar
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 new varchar
ndb/include/ndb_constants.h:
  wl-1442 new varchar
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 new varchar
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 new varchar
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbOperationDefine.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbOperationSearch.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbRecAttr.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbTransaction.cpp:
  wl-1442 new varchar
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1442 new varchar
sql/ha_ndbcluster.cc:
  wl-1442 new varchar
2005-01-07 11:55:20 +01:00
unknown
07ed380523 ndb: wl-1442 mysql vs ndb datatypes: prepare
ndb/include/Makefile.am:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/kernel/AttributeDescriptor.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/ndb_constants.h:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/ndb_types.h:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/ndbapi/NdbDictionary.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/util/NdbSqlUtil.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/vm/MetaData.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/Ndb.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/NdbScanOperation.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
2004-12-26 22:40:42 +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
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
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
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
47eb0b464c tux optim 14 - use pointers to cmp functions
ndb/test/ndbapi/testOIBasic.cpp:
  null related options, not related to this changeset
2004-08-27 13:57:51 +02:00
unknown
25c2c2a77c fix compile error on some platforms 2004-08-20 16:04:06 +00: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
9864327a61 ha_ndb blobs 2004-07-22 12:33:14 +02:00
unknown
8979db4182 removed warnings on Tru64 2004-06-17 17:32:03 +00:00
unknown
28306758b5 ndb api blobs 2004-06-10 12:04:30 +02:00
unknown
6386c55cee Initial revision of NDB Cluster files
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-04-14 10:53:21 +02:00