From 09a487266171a297db9fab88710c224e7526e8b6 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 8 Jan 2005 23:24:25 +0100 Subject: 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 --- ndb/include/ndb_constants.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'ndb/include/ndb_constants.h') diff --git a/ndb/include/ndb_constants.h b/ndb/include/ndb_constants.h index 04d86e267f7..91b026fdb53 100644 --- a/ndb/include/ndb_constants.h +++ b/ndb/include/ndb_constants.h @@ -53,12 +53,16 @@ #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_MAX 23 +// fill in NDB_TYPE_LONGVAR* at next merge 5.0-ndb -> 5.0 + +#define NDB_TYPE_TIME 25 + +#define NDB_TYPE_MAX 26 #endif -- cgit v1.2.1