diff options
author | unknown <pekka@mysql.com> | 2004-12-26 22:40:42 +0100 |
---|---|---|
committer | unknown <pekka@mysql.com> | 2004-12-26 22:40:42 +0100 |
commit | 07ed3805237617f595e45fb9a1b404a324821618 (patch) | |
tree | a973ec108862ff8f34f271a34debc1952514d1d6 /ndb/src/kernel/blocks/dbtup | |
parent | ff4d272eabd35324a922bba4d231c64b332cc44e (diff) | |
download | mariadb-git-07ed3805237617f595e45fb9a1b404a324821618.tar.gz |
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
Diffstat (limited to 'ndb/src/kernel/blocks/dbtup')
-rw-r--r-- | ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp | 7 | ||||
-rw-r--r-- | ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp index cb5477a1551..b07e840e25c 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp @@ -1540,13 +1540,8 @@ int Dbtup::interpreterNextLab(Signal* signal, // Calculate the number of words of this attribute. // We allow writes into arrays as long as they fit into the 64 bit // register size. - //TEST_MR See to that TattrNoOfWords can be - // read faster from attribute description. /* --------------------------------------------------------------- */ - Uint32 TarraySize = (TattrDesc1 >> 16); - Uint32 TattrLogLen = (TattrDesc1 >> 4) & 0xf; - Uint32 TattrNoOfBits = TarraySize << TattrLogLen; - Uint32 TattrNoOfWords = (TattrNoOfBits + 31) >> 5; + Uint32 TattrNoOfWords = AttributeDescriptor::getSizeInWords(TattrDesc1); Uint32 Toptype = operPtr.p->optype; Uint32 TdataForUpdate[3]; diff --git a/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp b/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp index 13593602abc..4ce807528c4 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp @@ -288,8 +288,7 @@ void Dbtup::execTUP_ADD_ATTRREQ(Signal* signal) ptrCheckGuard(fragOperPtr, cnoOfFragoprec, fragoperrec); Uint32 attrId = signal->theData[2]; Uint32 attrDescriptor = signal->theData[3]; - // DICT sends extended type (ignored) and charset number - Uint32 extType = (signal->theData[4] & 0xFF); + // DICT sends charset number in upper half Uint32 csNumber = (signal->theData[4] >> 16); regTabPtr.i = fragOperPtr.p->tableidFrag; |