summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
authorunknown <pekka@mysql.com>2005-01-08 19:28:44 +0100
committerunknown <pekka@mysql.com>2005-01-08 19:28:44 +0100
commit3186b340da79252758a4b1c47ea0a3b8b1b0d2a8 (patch)
tree030db052318f34f218ff376df78db882c005d42c /sql/ha_ndbcluster.cc
parent633ee9b09994333dd4ccdd85daa6aec4594d9346 (diff)
downloadmariadb-git-3186b340da79252758a4b1c47ea0a3b8b1b0d2a8.tar.gz
ndb - wl-1442 fix Time ordering
mysql-test/r/ndb_index_ordered.result: wl-1442 fix Time. adds new type id 25 mysql-test/t/ndb_index_ordered.test: wl-1442 fix Time. adds new type id 25 ndb/include/kernel/signaldata/DictTabInfo.hpp: wl-1442 fix Time. adds new type id 25 ndb/include/ndbapi/NdbDictionary.hpp: wl-1442 fix Time. adds new type id 25 ndb/include/util/NdbSqlUtil.hpp: wl-1442 fix Time. adds new type id 25 ndb/src/common/util/NdbSqlUtil.cpp: wl-1442 fix Time. adds new type id 25 ndb/src/ndbapi/NdbDictionary.cpp: wl-1442 fix Time. adds new type id 25 ndb/src/ndbapi/NdbDictionaryImpl.cpp: wl-1442 fix Time. adds new type id 25 ndb/test/include/NdbSchemaOp.hpp: wl-1442 fix Time. adds new type id 25 ndb/tools/restore/consumer.cpp: wl-1442 fix Time. adds new type id 25 sql/ha_ndbcluster.cc: wl-1442 fix Time. adds new type id 25
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index e181b421e29..e4c45490050 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -2264,6 +2264,11 @@ void ha_ndbcluster::print_results()
fprintf(DBUG_FILE, "Date\t%llu", value);
break;
}
+ case NdbDictionary::Column::Time: {
+ Uint64 value= (Uint64) *field->ptr;
+ fprintf(DBUG_FILE, "Time\t%llu", value);
+ break;
+ }
case NdbDictionary::Column::Blob: {
Uint64 len= 0;
ndb_blob->getLength(len);
@@ -3327,8 +3332,11 @@ static int create_ndb_column(NDBCOL &col,
col.setType(NDBCOL::Date);
col.setLength(1);
break;
- case MYSQL_TYPE_DATE: // ?
case MYSQL_TYPE_TIME:
+ col.setType(NDBCOL::Time);
+ col.setLength(1);
+ break;
+ case MYSQL_TYPE_DATE: // ?
case MYSQL_TYPE_YEAR:
col.setType(NDBCOL::Char);
col.setLength(field->pack_length());