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/ndb_constants.h | |
| 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/ndb_constants.h')
| -rw-r--r-- | ndb/include/ndb_constants.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ndb/include/ndb_constants.h b/ndb/include/ndb_constants.h index b4e42fb83f5..491d0719a69 100644 --- a/ndb/include/ndb_constants.h +++ b/ndb/include/ndb_constants.h @@ -53,17 +53,15 @@ #define NDB_TYPE_VARCHAR 15 #define NDB_TYPE_BINARY 16 #define NDB_TYPE_VARBINARY 17 -#define NDB_TYPE_DATETIME 18 // need to fix -#define NDB_TYPE_TIMESPEC 19 // need to fix +#define NDB_TYPE_DATETIME 18 +#define NDB_TYPE_DATE 19 #define NDB_TYPE_BLOB 20 #define NDB_TYPE_TEXT 21 #define NDB_TYPE_BIT 22 #define NDB_TYPE_LONG_VARCHAR 23 #define NDB_TYPE_LONG_VARBINARY 24 +#define NDB_TYPE_TIME 25 -// add at next merge 4.1->5.0 -// #define NDB_TYPE_TIME 25 - -#define NDB_TYPE_MAX 25 +#define NDB_TYPE_MAX 26 #endif |