Merge

1 files changed, 14 insertions, 6 deletions

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 290d73554ca..76da1bdc6c9 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -2361,13 +2361,15 @@ void ha_ndbcluster::print_results()
       break;
     }
     case NdbDictionary::Column::Datetime: {
-      // todo
-      my_snprintf(buf, sizeof(buf), "Datetime ?");
+      my_snprintf(buf, sizeof(buf), "Datetime ?");      // fix-me
       break;
     }
-    case NdbDictionary::Column::Timespec: {
-      // todo
-      my_snprintf(buf, sizeof(buf), "Timespec ?");
+    case NdbDictionary::Column::Date: {
+      my_snprintf(buf, sizeof(buf), "Date ?");  // fix-me
+      break;
+    }
+    case NdbDictionary::Column::Time: {
+      my_snprintf(buf, sizeof(buf), "Time ?");  // fix-me
       break;
     }
     case NdbDictionary::Column::Blob: {
@@ -3446,9 +3448,15 @@ static int create_ndb_column(NDBCOL &col,
     col.setType(NDBCOL::Datetime);
     col.setLength(1);
     break;
-  case MYSQL_TYPE_DATE:
   case MYSQL_TYPE_NEWDATE:
+    col.setType(NDBCOL::Date);
+    col.setLength(1);
+    break;
   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());