Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/jwinstead2/mysql-4.1-clean

11 files changed, 294 insertions, 59 deletions

diff --git a/mysql-test/r/ndb_index_ordered.result b/mysql-test/r/ndb_index_ordered.result
index 50f904af750..75a5e42732b 100644
--- a/mysql-test/r/ndb_index_ordered.result
+++ b/mysql-test/r/ndb_index_ordered.result
@@ -310,3 +310,113 @@ SubscrID	SbclID
 3	NULL
 drop table test1;
 drop table test2;
+create table t1 (
+pk int primary key,
+dt datetime not null,
+da date not null,
+ye year not null,
+ti time not null,
+ts timestamp not null,
+index(dt),
+index(da),
+index(ye),
+index(ti),
+index(ts)
+) engine=ndb;
+insert into t1 (pk,dt,da,ye,ti) values
+(1, '1901-05-05 23:00:59', '1901-05-05', '1901', '23:00:59'),
+(2, '1912-09-05 13:00:59', '1912-09-05', '1912', '13:00:59'),
+(3, '1945-12-31 00:00:00', '1945-12-31', '1945', '00:00:00'),
+(4, '1955-12-31 00:00:00', '1955-12-31', '1955', '00:00:00'),
+(5, '1963-06-06 06:06:06', '1963-06-06', '1963', '06:06:06'),
+(6, '1993-06-06 06:06:06', '1993-06-06', '1993', '06:06:06'),
+(7, '2001-01-01 10:11:10', '2001-01-01', '2001', '10:11:10'),
+(8, '2001-01-01 10:11:11', '2001-01-01', '2001', '10:11:11'),
+(9, '2005-01-31 23:59:59', '2005-01-31', '2005', '23:59:59');
+select count(*)-9 from t1 use index (dt) where dt >  '1900-01-01 00:00:00';
+count(*)-9
+0
+select count(*)-6 from t1 use index (dt) where dt >= '1955-12-31 00:00:00';
+count(*)-6
+0
+select count(*)-5 from t1 use index (dt) where dt >  '1955-12-31 00:00:00';
+count(*)-5
+0
+select count(*)-5 from t1 use index (dt) where dt <  '1970-03-03 22:22:22';
+count(*)-5
+0
+select count(*)-7 from t1 use index (dt) where dt <  '2001-01-01 10:11:11';
+count(*)-7
+0
+select count(*)-8 from t1 use index (dt) where dt <= '2001-01-01 10:11:11';
+count(*)-8
+0
+select count(*)-9 from t1 use index (dt) where dt <= '2055-01-01 00:00:00';
+count(*)-9
+0
+select count(*)-9 from t1 use index (da) where da >  '1900-01-01';
+count(*)-9
+0
+select count(*)-6 from t1 use index (da) where da >= '1955-12-31';
+count(*)-6
+0
+select count(*)-5 from t1 use index (da) where da >  '1955-12-31';
+count(*)-5
+0
+select count(*)-5 from t1 use index (da) where da <  '1970-03-03';
+count(*)-5
+0
+select count(*)-6 from t1 use index (da) where da <  '2001-01-01';
+count(*)-6
+0
+select count(*)-8 from t1 use index (da) where da <= '2001-01-02';
+count(*)-8
+0
+select count(*)-9 from t1 use index (da) where da <= '2055-01-01';
+count(*)-9
+0
+select count(*)-9 from t1 use index (ye) where ye >  '1900';
+count(*)-9
+0
+select count(*)-6 from t1 use index (ye) where ye >= '1955';
+count(*)-6
+0
+select count(*)-5 from t1 use index (ye) where ye >  '1955';
+count(*)-5
+0
+select count(*)-5 from t1 use index (ye) where ye <  '1970';
+count(*)-5
+0
+select count(*)-6 from t1 use index (ye) where ye <  '2001';
+count(*)-6
+0
+select count(*)-8 from t1 use index (ye) where ye <= '2001';
+count(*)-8
+0
+select count(*)-9 from t1 use index (ye) where ye <= '2055';
+count(*)-9
+0
+select count(*)-9 from t1 use index (ti) where ti >= '00:00:00';
+count(*)-9
+0
+select count(*)-7 from t1 use index (ti) where ti >  '00:00:00';
+count(*)-7
+0
+select count(*)-7 from t1 use index (ti) where ti >  '05:05:05';
+count(*)-7
+0
+select count(*)-5 from t1 use index (ti) where ti >  '06:06:06';
+count(*)-5
+0
+select count(*)-5 from t1 use index (ti) where ti <  '10:11:11';
+count(*)-5
+0
+select count(*)-6 from t1 use index (ti) where ti <= '10:11:11';
+count(*)-6
+0
+select count(*)-8 from t1 use index (ti) where ti <  '23:59:59';
+count(*)-8
+0
+select count(*)-9 from t1 use index (ti) where ti <= '23:59:59';
+count(*)-9
+0
diff --git a/mysql-test/t/ndb_index_ordered.test b/mysql-test/t/ndb_index_ordered.test
index 53177511bc6..71635159604 100644
--- a/mysql-test/t/ndb_index_ordered.test
+++ b/mysql-test/t/ndb_index_ordered.test
@@ -172,3 +172,67 @@ SELECT s.SubscrID,l.SbclID FROM test1 s left JOIN test2 l ON
 l.SbcrID=s.SubscrID WHERE s.UsrID=224 order by 1, 2;
 drop table test1;
 drop table test2;
+
+# bug#7424 + bug#7725
+
+create table t1 (
+  pk int primary key,
+  dt datetime not null,
+  da date not null,
+  ye year not null,
+  ti time not null,
+  ts timestamp not null,
+  index(dt),
+  index(da),
+  index(ye),
+  index(ti),
+  index(ts)
+) engine=ndb;
+
+insert into t1 (pk,dt,da,ye,ti) values
+  (1, '1901-05-05 23:00:59', '1901-05-05', '1901', '23:00:59'),
+  (2, '1912-09-05 13:00:59', '1912-09-05', '1912', '13:00:59'),
+  (3, '1945-12-31 00:00:00', '1945-12-31', '1945', '00:00:00'),
+  (4, '1955-12-31 00:00:00', '1955-12-31', '1955', '00:00:00'),
+  (5, '1963-06-06 06:06:06', '1963-06-06', '1963', '06:06:06'),
+  (6, '1993-06-06 06:06:06', '1993-06-06', '1993', '06:06:06'),
+  (7, '2001-01-01 10:11:10', '2001-01-01', '2001', '10:11:10'),
+  (8, '2001-01-01 10:11:11', '2001-01-01', '2001', '10:11:11'),
+  (9, '2005-01-31 23:59:59', '2005-01-31', '2005', '23:59:59');
+
+# datetime
+select count(*)-9 from t1 use index (dt) where dt >  '1900-01-01 00:00:00';
+select count(*)-6 from t1 use index (dt) where dt >= '1955-12-31 00:00:00';
+select count(*)-5 from t1 use index (dt) where dt >  '1955-12-31 00:00:00';
+select count(*)-5 from t1 use index (dt) where dt <  '1970-03-03 22:22:22';
+select count(*)-7 from t1 use index (dt) where dt <  '2001-01-01 10:11:11';
+select count(*)-8 from t1 use index (dt) where dt <= '2001-01-01 10:11:11';
+select count(*)-9 from t1 use index (dt) where dt <= '2055-01-01 00:00:00';
+
+# date
+select count(*)-9 from t1 use index (da) where da >  '1900-01-01';
+select count(*)-6 from t1 use index (da) where da >= '1955-12-31';
+select count(*)-5 from t1 use index (da) where da >  '1955-12-31';
+select count(*)-5 from t1 use index (da) where da <  '1970-03-03';
+select count(*)-6 from t1 use index (da) where da <  '2001-01-01';
+select count(*)-8 from t1 use index (da) where da <= '2001-01-02';
+select count(*)-9 from t1 use index (da) where da <= '2055-01-01';
+
+# year
+select count(*)-9 from t1 use index (ye) where ye >  '1900';
+select count(*)-6 from t1 use index (ye) where ye >= '1955';
+select count(*)-5 from t1 use index (ye) where ye >  '1955';
+select count(*)-5 from t1 use index (ye) where ye <  '1970';
+select count(*)-6 from t1 use index (ye) where ye <  '2001';
+select count(*)-8 from t1 use index (ye) where ye <= '2001';
+select count(*)-9 from t1 use index (ye) where ye <= '2055';
+
+# time
+select count(*)-9 from t1 use index (ti) where ti >= '00:00:00';
+select count(*)-7 from t1 use index (ti) where ti >  '00:00:00';
+select count(*)-7 from t1 use index (ti) where ti >  '05:05:05';
+select count(*)-5 from t1 use index (ti) where ti >  '06:06:06';
+select count(*)-5 from t1 use index (ti) where ti <  '10:11:11';
+select count(*)-6 from t1 use index (ti) where ti <= '10:11:11';
+select count(*)-8 from t1 use index (ti) where ti <  '23:59:59';
+select count(*)-9 from t1 use index (ti) where ti <= '23:59:59';
diff --git a/ndb/include/kernel/signaldata/DictTabInfo.hpp b/ndb/include/kernel/signaldata/DictTabInfo.hpp
index ae78c023c2a..3e73ae67ebe 100644
--- a/ndb/include/kernel/signaldata/DictTabInfo.hpp
+++ b/ndb/include/kernel/signaldata/DictTabInfo.hpp
@@ -308,9 +308,10 @@ public:
     ExtBinary = NdbSqlUtil::Type::Binary,
     ExtVarbinary = NdbSqlUtil::Type::Varbinary,
     ExtDatetime = NdbSqlUtil::Type::Datetime,
-    ExtTimespec = NdbSqlUtil::Type::Timespec,
+    ExtDate = NdbSqlUtil::Type::Date,
     ExtBlob = NdbSqlUtil::Type::Blob,
-    ExtText = NdbSqlUtil::Type::Text
+    ExtText = NdbSqlUtil::Type::Text,
+    ExtTime = NdbSqlUtil::Type::Time
   };
 
   // Attribute data interpretation
@@ -428,10 +429,10 @@ public:
         AttributeSize = DictTabInfo::an8Bit;
         AttributeArraySize = 8 * AttributeExtLength;
         return true;
-      case DictTabInfo::ExtTimespec:
+      case DictTabInfo::ExtDate:
         AttributeType = DictTabInfo::StringType;
         AttributeSize = DictTabInfo::an8Bit;
-        AttributeArraySize = 12 * AttributeExtLength;
+        AttributeArraySize = 3 * AttributeExtLength;
         return true;
       case DictTabInfo::ExtBlob:
       case DictTabInfo::ExtText:
@@ -440,6 +441,11 @@ public:
         // head + inline part [ attr precision lower half ]
         AttributeArraySize = (NDB_BLOB_HEAD_SIZE << 2) + (AttributeExtPrecision & 0xFFFF);
         return true;
+      case DictTabInfo::ExtTime:
+        AttributeType = DictTabInfo::StringType;
+        AttributeSize = DictTabInfo::an8Bit;
+        AttributeArraySize = 3 * AttributeExtLength;
+        return true;
       };
       return false;
     }
diff --git a/ndb/include/ndbapi/NdbDictionary.hpp b/ndb/include/ndbapi/NdbDictionary.hpp
index f0c8a10f488..454b267d1b0 100644
--- a/ndb/include/ndbapi/NdbDictionary.hpp
+++ b/ndb/include/ndbapi/NdbDictionary.hpp
@@ -185,9 +185,10 @@ public:
       Binary,        ///< Len
       Varbinary,     ///< Max len
       Datetime,    ///< Precision down to 1 sec (sizeof(Datetime) == 8 bytes )
-      Timespec,    ///< Precision down to 1 nsec(sizeof(Datetime) == 12 bytes )
+      Date,        ///< Precision down to 1 day(sizeof(Date) == 4 bytes )
       Blob,        ///< Binary large object (see NdbBlob)
-      Text         ///< Text blob
+      Text,        ///< Text blob
+      Time = 25    ///< Time without date
     };
 
     /** 
diff --git a/ndb/include/util/NdbSqlUtil.hpp b/ndb/include/util/NdbSqlUtil.hpp
index 3062d1e4e1b..10024d9b616 100644
--- a/ndb/include/util/NdbSqlUtil.hpp
+++ b/ndb/include/util/NdbSqlUtil.hpp
@@ -81,9 +81,10 @@ public:
       Binary,           // Len
       Varbinary,        // Max len
       Datetime,         // Precision down to 1 sec  (size 8 bytes)
-      Timespec,         // Precision down to 1 nsec (size 12 bytes)
+      Date,             // Precision down to 1 day (size 4 bytes)
       Blob,             // Blob
-      Text              // Text blob
+      Text,             // Text blob
+      Time = 25         // Time without date
     };
     Enum m_typeId;
     Cmp* m_cmp;         // comparison method
@@ -132,9 +133,10 @@ private:
   static Cmp cmpBinary;
   static Cmp cmpVarbinary;
   static Cmp cmpDatetime;
-  static Cmp cmpTimespec;
+  static Cmp cmpDate;
   static Cmp cmpBlob;
   static Cmp cmpText;
+  static Cmp cmpTime;
 };
 
 #endif
diff --git a/ndb/src/common/util/NdbSqlUtil.cpp b/ndb/src/common/util/NdbSqlUtil.cpp
index 5b2381df50a..233698ae52b 100644
--- a/ndb/src/common/util/NdbSqlUtil.cpp
+++ b/ndb/src/common/util/NdbSqlUtil.cpp
@@ -153,8 +153,8 @@ NdbSqlUtil::m_typeList[] = {
     cmpDatetime
   },
   {
-    Type::Timespec,
-    cmpTimespec
+    Type::Date,
+    cmpDate
   },
   {
     Type::Blob,
@@ -163,6 +163,22 @@ NdbSqlUtil::m_typeList[] = {
   {
     Type::Text,
     cmpText
+  },
+  {
+    Type::Undefined,    // 5.0 Bit
+    NULL
+  },
+  {
+    Type::Undefined,    // 5.0 Longvarchar
+    NULL
+  },
+  {
+    Type::Undefined,    // 5.0 Longvarbinary
+    NULL
+  },
+  {
+    Type::Time,
+    cmpTime
   }
 };
 
@@ -469,56 +485,50 @@ int
 NdbSqlUtil::cmpDatetime(const void* info, const Uint32* p1, const Uint32* p2, Uint32 full, Uint32 size)
 {
   assert(full >= size && size > 0);
-  /*
-   * Datetime is CC YY MM DD hh mm ss \0
-   *
-   * Not used via MySQL.
-   */
-  union { const Uint32* p; const unsigned char* v; } u1, u2;
-  u1.p = p1;
-  u2.p = p2;
-  // no format check
-  int k = memcmp(u1.v, u2.v, 4);
-  if (k != 0)
-    return k < 0 ? -1 : +1;
   if (size >= 2) {
-    k = memcmp(u1.v + 4, u2.v + 4, 4);
-    return k < 0 ? -1 : k > 0 ? +1 : 0;
+    union { Uint32 p[2]; Int64 v; } u1, u2;
+    u1.p[0] = p1[0];
+    u1.p[1] = p1[1];
+    u2.p[0] = p2[0];
+    u2.p[1] = p2[1];
+    if (u1.v < u2.v)
+      return -1;
+    if (u1.v > u2.v)
+      return +1;
+    return 0;
   }
   return CmpUnknown;
 }
 
 int
-NdbSqlUtil::cmpTimespec(const void* info, const Uint32* p1, const Uint32* p2, Uint32 full, Uint32 size)
+NdbSqlUtil::cmpDate(const void* info, const Uint32* p1, const Uint32* p2, Uint32 full, Uint32 size)
 {
+#ifdef ndb_date_is_4_byte_native_int
+  assert(full >= size && size > 0);
+  union { Uint32 p[2]; Int32 v; } u1, u2;
+  u1.p[0] = p1[0];
+  u2.p[0] = p2[0];
+  if (u1.v < u2.v)
+    return -1;
+  if (u1.v > u2.v)
+    return +1;
+  return 0;
+#else
   assert(full >= size && size > 0);
-  /*
-   * Timespec is CC YY MM DD hh mm ss \0 NN NN NN NN
-   *
-   * Not used via MySQL.
-   */
   union { const Uint32* p; const unsigned char* v; } u1, u2;
   u1.p = p1;
   u2.p = p2;
-  // no format check
-  int k = memcmp(u1.v, u2.v, 4);
-  if (k != 0)
-    return k < 0 ? -1 : +1;
-  if (size >= 2) {
-    k = memcmp(u1.v + 4, u2.v + 4, 4);
-    if (k != 0)
-      return k < 0 ? -1 : +1;
-    if (size >= 3) {
-      Uint32 n1 = *(const Uint32*)(u1.v + 8);
-      Uint32 n2 = *(const Uint32*)(u2.v + 8);
-      if (n1 < n2)
-        return -1;
-      if (n2 > n1)
-        return +1;
-      return 0;
-    }
-  }
-  return CmpUnknown;
+  // from Field_newdate::val_int
+  Uint64 j1 = uint3korr(u1.v);
+  Uint64 j2 = uint3korr(u2.v);
+  j1 = (j1 % 32L)+(j1 / 32L % 16L)*100L + (j1/(16L*32L))*10000L;
+  j2 = (j2 % 32L)+(j2 / 32L % 16L)*100L + (j2/(16L*32L))*10000L;
+  if (j1 < j2)
+    return -1;
+  if (j1 > j2)
+    return +1;
+  return 0;
+#endif
 }
 
 int
@@ -565,6 +575,23 @@ NdbSqlUtil::cmpText(const void* info, const Uint32* p1, const Uint32* p2, Uint32
   return CmpUnknown;
 }
 
+int
+NdbSqlUtil::cmpTime(const void* info, const Uint32* p1, const Uint32* p2, Uint32 full, Uint32 size)
+{
+  assert(full >= size && size > 0);
+  union { const Uint32* p; const unsigned char* v; } u1, u2;
+  u1.p = p1;
+  u2.p = p2;
+  // from Field_time::val_int
+  Int32 j1 = sint3korr(u1.v);
+  Int32 j2 = sint3korr(u2.v);
+  if (j1 < j2)
+    return -1;
+  if (j1 > j2)
+    return +1;
+  return 0;
+}
+
 // check charset
 
 bool
diff --git a/ndb/src/ndbapi/NdbDictionary.cpp b/ndb/src/ndbapi/NdbDictionary.cpp
index f88bbc907a6..0508d8bf277 100644
--- a/ndb/src/ndbapi/NdbDictionary.cpp
+++ b/ndb/src/ndbapi/NdbDictionary.cpp
@@ -936,8 +936,8 @@ operator<<(NdbOut& out, const NdbDictionary::Column& col)
   case NdbDictionary::Column::Datetime:
     out << "Datetime";
     break;
-  case NdbDictionary::Column::Timespec:
-    out << "Timespec";
+  case NdbDictionary::Column::Date:
+    out << "Date";
     break;
   case NdbDictionary::Column::Blob:
     out << "Blob(" << col.getInlineSize() << "," << col.getPartSize()
@@ -947,6 +947,9 @@ operator<<(NdbOut& out, const NdbDictionary::Column& col)
     out << "Text(" << col.getInlineSize() << "," << col.getPartSize()
         << ";" << col.getStripeSize() << ";" << csname << ")";
     break;
+  case NdbDictionary::Column::Time:
+    out << "Time";
+    break;
   case NdbDictionary::Column::Undefined:
     out << "Undefined";
     break;
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/ndb/src/ndbapi/NdbDictionaryImpl.cpp
index 7a293463c94..59474943f3b 100644
--- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp
@@ -130,7 +130,7 @@ NdbColumnImpl::init(Type t)
   case Binary:
   case Varbinary:
   case Datetime:
-  case Timespec:
+  case Date:
     m_precision = 0;
     m_scale = 0;
     m_length = 1;
@@ -148,6 +148,12 @@ NdbColumnImpl::init(Type t)
     m_length = 4;
     m_cs = default_cs;
     break;
+  case Time:
+    m_precision = 0;
+    m_scale = 0;
+    m_length = 1;
+    m_cs = NULL;
+    break;
   case Undefined:
     assert(false);
     break;
@@ -1174,9 +1180,10 @@ columnTypeMapping[] = {
   { DictTabInfo::ExtBinary,          NdbDictionary::Column::Binary },
   { DictTabInfo::ExtVarbinary,       NdbDictionary::Column::Varbinary },
   { DictTabInfo::ExtDatetime,        NdbDictionary::Column::Datetime },
-  { DictTabInfo::ExtTimespec,        NdbDictionary::Column::Timespec },
+  { DictTabInfo::ExtDate,            NdbDictionary::Column::Date },
   { DictTabInfo::ExtBlob,            NdbDictionary::Column::Blob },
   { DictTabInfo::ExtText,            NdbDictionary::Column::Text },
+  { DictTabInfo::ExtTime,            NdbDictionary::Column::Time },
   { -1, -1 }
 };
 
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;
diff --git a/ndb/tools/restore/consumer.cpp b/ndb/tools/restore/consumer.cpp
index e94c31b2666..4d228230423 100644
--- a/ndb/tools/restore/consumer.cpp
+++ b/ndb/tools/restore/consumer.cpp
@@ -71,7 +71,10 @@ BackupConsumer::create_table_string(const TableS & table,
     case NdbDictionary::Column::Datetime:
       pos += sprintf(buf+pos, "%s", "datetime");
       break;
-    case NdbDictionary::Column::Timespec:
+    case NdbDictionary::Column::Date:
+      pos += sprintf(buf+pos, "%s", "date");
+      break;
+    case NdbDictionary::Column::Time:
       pos += sprintf(buf+pos, "%s", "time");
       break;
     case NdbDictionary::Column::Undefined:
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 3c6cd83d5dc..e4c45490050 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -2259,9 +2259,14 @@ void ha_ndbcluster::print_results()
       fprintf(DBUG_FILE, "Datetime\t%llu", value);
       break;
     }
-    case NdbDictionary::Column::Timespec: {
+    case NdbDictionary::Column::Date: {
       Uint64 value= (Uint64) *field->ptr;
-      fprintf(DBUG_FILE, "Timespec\t%llu", value);
+      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: {
@@ -3323,9 +3328,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());