diff options
| author | unknown <pekka@mysql.com> | 2005-01-08 22:34:16 +0100 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2005-01-08 22:34:16 +0100 |
| commit | 2c12921a64910aca3f0c3b2c8b4d166781721b8f (patch) | |
| tree | cb43fe2faff44cd0b0f5a29ce87fce61522e5294 /ndb/test/include | |
| parent | 5802259dc5ca818c53332b360dba09570f4f6e81 (diff) | |
| parent | 94504d529be8e3bcb562fd5ccbbb2fa916204d4c (diff) | |
| download | mariadb-git-2c12921a64910aca3f0c3b2c8b4d166781721b8f.tar.gz | |
Merge
client/mysql.cc:
Auto merged
mysql-test/r/ndb_index_ordered.result:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
merge
ndb/include/ndbapi/NdbDictionary.hpp:
merge
ndb/include/util/NdbSqlUtil.hpp:
merge
ndb/src/common/util/NdbSqlUtil.cpp:
merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
merge
sql/ha_ndbcluster.cc:
merge
Diffstat (limited to 'ndb/test/include')
| -rw-r--r-- | ndb/test/include/NdbSchemaOp.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/test/include/NdbSchemaOp.hpp b/ndb/test/include/NdbSchemaOp.hpp index ac859f8abe8..e2fb4015b88 100644 --- a/ndb/test/include/NdbSchemaOp.hpp +++ b/ndb/test/include/NdbSchemaOp.hpp @@ -576,7 +576,8 @@ convertColumnTypeToAttrType(NdbDictionary::Column::Type _type) case NdbDictionary::Column::Varbinary: return String; case NdbDictionary::Column::Datetime: - case NdbDictionary::Column::Timespec: + case NdbDictionary::Column::Date: + case NdbDictionary::Column::Time: case NdbDictionary::Column::Undefined: default: return NoAttrTypeDef; |