diff options
| author | unknown <pekka@mysql.com> | 2005-01-09 00:45:06 +0100 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2005-01-09 00:45:06 +0100 |
| commit | f029af067b5e68222d3b52e5c3c400ba47ef411d (patch) | |
| tree | f4e1eba2241ebc4cef73aa11e6ed710e36bb2d41 /ndb/include/kernel | |
| parent | 3fbb1dd5fff45824f25916ad40488592a067ca86 (diff) | |
| parent | 09a487266171a297db9fab88710c224e7526e8b6 (diff) | |
| download | mariadb-git-f029af067b5e68222d3b52e5c3c400ba47ef411d.tar.gz | |
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
Diffstat (limited to 'ndb/include/kernel')
| -rw-r--r-- | ndb/include/kernel/signaldata/DictTabInfo.hpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ndb/include/kernel/signaldata/DictTabInfo.hpp b/ndb/include/kernel/signaldata/DictTabInfo.hpp index cc8a647615c..93ad246a094 100644 --- a/ndb/include/kernel/signaldata/DictTabInfo.hpp +++ b/ndb/include/kernel/signaldata/DictTabInfo.hpp @@ -266,12 +266,13 @@ public: ExtBinary = NdbSqlUtil::Type::Binary, ExtVarbinary = NdbSqlUtil::Type::Varbinary, ExtDatetime = NdbSqlUtil::Type::Datetime, - ExtTimespec = NdbSqlUtil::Type::Timespec, + ExtDate = NdbSqlUtil::Type::Date, ExtBlob = NdbSqlUtil::Type::Blob, ExtText = NdbSqlUtil::Type::Text, ExtBit = NdbSqlUtil::Type::Bit, ExtLongvarchar = NdbSqlUtil::Type::Longvarchar, - ExtLongvarbinary = NdbSqlUtil::Type::Longvarbinary + ExtLongvarbinary = NdbSqlUtil::Type::Longvarbinary, + ExtTime = NdbSqlUtil::Type::Time }; // Attribute data interpretation @@ -358,10 +359,10 @@ public: AttributeSize = DictTabInfo::an8Bit; AttributeArraySize = 8 * AttributeExtLength; break; - case DictTabInfo::ExtTimespec: + case DictTabInfo::ExtDate: // to fix AttributeSize = DictTabInfo::an8Bit; - AttributeArraySize = 12 * AttributeExtLength; + AttributeArraySize = 3 * AttributeExtLength; break; case DictTabInfo::ExtBlob: case DictTabInfo::ExtText: @@ -380,6 +381,10 @@ public: AttributeSize = DictTabInfo::an8Bit; AttributeArraySize = AttributeExtLength + 2; break; + case DictTabInfo::ExtTime: + AttributeSize = DictTabInfo::an8Bit; + AttributeArraySize = 3 * AttributeExtLength; + break; default: return false; }; |