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/util/NdbSqlUtil.hpp | |
| 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/util/NdbSqlUtil.hpp')
| -rw-r--r-- | ndb/include/util/NdbSqlUtil.hpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ndb/include/util/NdbSqlUtil.hpp b/ndb/include/util/NdbSqlUtil.hpp index feb2b97c54b..529e02f1d89 100644 --- a/ndb/include/util/NdbSqlUtil.hpp +++ b/ndb/include/util/NdbSqlUtil.hpp @@ -86,12 +86,13 @@ public: Binary = NDB_TYPE_BINARY, Varbinary = NDB_TYPE_VARBINARY, Datetime = NDB_TYPE_DATETIME, - Timespec = NDB_TYPE_TIMESPEC, + Date = NDB_TYPE_DATE, Blob = NDB_TYPE_BLOB, Text = NDB_TYPE_TEXT, - Bit = NDB_TYPE_BIT, + Bit = NDB_TYPE_BIT Longvarchar = NDB_TYPE_LONG_VARCHAR, - Longvarbinary = NDB_TYPE_LONG_VARBINARY + Longvarbinary = NDB_TYPE_LONG_VARBINARY, + Time = NDB_TYPE_TIME }; Enum m_typeId; // redundant Cmp* m_cmp; // comparison method @@ -153,12 +154,13 @@ private: static Cmp cmpBinary; static Cmp cmpVarbinary; static Cmp cmpDatetime; - static Cmp cmpTimespec; + static Cmp cmpDate; static Cmp cmpBlob; static Cmp cmpText; static Cmp cmpBit; static Cmp cmpLongvarchar; static Cmp cmpLongvarbinary; + static Cmp cmpTime; }; #endif |