diff options
| author | unknown <pekka@mysql.com> | 2005-01-08 23:24:25 +0100 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2005-01-08 23:24:25 +0100 |
| commit | 09a487266171a297db9fab88710c224e7526e8b6 (patch) | |
| tree | 19a12f2bf7082ec3646cd9c3cfe1e1a3d61bbc9e /ndb/include | |
| parent | 2c12921a64910aca3f0c3b2c8b4d166781721b8f (diff) | |
| download | mariadb-git-09a487266171a297db9fab88710c224e7526e8b6.tar.gz | |
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
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/kernel/signaldata/DictTabInfo.hpp | 1 | ||||
| -rw-r--r-- | ndb/include/ndb_constants.h | 10 | ||||
| -rw-r--r-- | ndb/include/util/NdbSqlUtil.hpp | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/ndb/include/kernel/signaldata/DictTabInfo.hpp b/ndb/include/kernel/signaldata/DictTabInfo.hpp index 10e78e9a4d2..65937cae0d1 100644 --- a/ndb/include/kernel/signaldata/DictTabInfo.hpp +++ b/ndb/include/kernel/signaldata/DictTabInfo.hpp @@ -384,7 +384,6 @@ public: AttributeArraySize = (NDB_BLOB_HEAD_SIZE << 2) + (AttributeExtPrecision & 0xFFFF); return true; case DictTabInfo::ExtTime: - AttributeType = DictTabInfo::StringType; AttributeSize = DictTabInfo::an8Bit; AttributeArraySize = 3 * AttributeExtLength; return true; 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 diff --git a/ndb/include/util/NdbSqlUtil.hpp b/ndb/include/util/NdbSqlUtil.hpp index ec637566f54..058c00df93d 100644 --- a/ndb/include/util/NdbSqlUtil.hpp +++ b/ndb/include/util/NdbSqlUtil.hpp @@ -83,7 +83,7 @@ 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, |