Merge lp:~brianaker/drizzle/timestamp into lp:drizzle/7.0

[Brian Aker]

[lp:~brianaker/drizzle/timestamp]

2123. By Lee Bieber on 2011-01-27

Merge Patrick - fix bug 708879: dbqp.py --suite option should handle comma-separated list
Merge Brian - more timestamp updates and fixes
Merge Patrick - fix bug 708861: dbqp.py not running on freebsd
Merge Patrick - Added license text to dbqp-related files

=== modified file 'drizzled/error.cc'
--- drizzled/error.cc	2011-01-25 07:24:41 +0000
+++ drizzled/error.cc	2011-01-27 20:14:35 +0000
@@ -473,10 +473,14 @@
   ADD_ERROR_MESSAGE(ER_WRONG_PARAMETERS_TO_NATIVE_FCT, N_("Incorrect parameters in the call to native function '%-.192s'"));
   ADD_ERROR_MESSAGE(ER_DUP_ENTRY_WITH_KEY_NAME, N_("Duplicate entry '%-.64s' for key '%-.192s'"));
   ADD_ERROR_MESSAGE(ER_LOAD_DATA_INVALID_COLUMN, N_("Invalid column reference (%-.64s) in LOAD DATA"));
-  ADD_ERROR_MESSAGE(ER_INVALID_UNIX_TIMESTAMP_VALUE, N_("Received an invalid value '%s' for a UNIX timestamp."));
+
   ADD_ERROR_MESSAGE(ER_INVALID_DATETIME_VALUE, N_("Received an invalid datetime value '%s'."));
+  ADD_ERROR_MESSAGE(ER_INVALID_DATE_VALUE, N_("Received an invalid DATE value '%s'."));
+  ADD_ERROR_MESSAGE(ER_INVALID_NULL_ARGUMENT, N_("Received a NULL argument for function '%s'."));
   ADD_ERROR_MESSAGE(ER_INVALID_TIMESTAMP_VALUE, N_("Received an invalid timestamp value '%s'."));
-  ADD_ERROR_MESSAGE(ER_INVALID_NULL_ARGUMENT, N_("Received a NULL argument for function '%s'."));
+  ADD_ERROR_MESSAGE(ER_INVALID_TIME_VALUE, N_("Received an invalid TIME value '%s'."));
+  ADD_ERROR_MESSAGE(ER_INVALID_UNIX_TIMESTAMP_VALUE, N_("Received an invalid value '%s' for a UNIX timestamp."));
+
   ADD_ERROR_MESSAGE(ER_ARGUMENT_OUT_OF_RANGE, N_("Received an out-of-range argument '%s' for function '%s'."));
   ADD_ERROR_MESSAGE(ER_INVALID_ENUM_VALUE, N_("Received an invalid enum value '%s'."));
   ADD_ERROR_MESSAGE(ER_NO_PRIMARY_KEY_ON_REPLICATED_TABLE, N_("Tables which are replicated require a primary key."));
 
=== modified file 'drizzled/error_t.h'
--- drizzled/error_t.h	2011-01-24 21:11:46 +0000
+++ drizzled/error_t.h	2011-01-27 20:14:35 +0000
@@ -860,7 +860,10 @@
 
   ER_PARSE_ERROR_UNKNOWN,
   ER_INVALID_CAST_TO_BOOLEAN,
+  ER_INVALID_TIME_VALUE,
+  ER_INVALID_DATE_VALUE,
   ER_TRANSACTIONAL_DDL_NOT_SUPPORTED,
+
   // Leave ER_INVALID_BOOLEAN_VALUE as LAST, and force people to use tags
   // instead of numbers in error messages in test.
   ER_ERROR_LAST=   ER_TRANSACTIONAL_DDL_NOT_SUPPORTED
 
=== modified file 'drizzled/field/date.cc'
--- drizzled/field/date.cc	2011-01-25 05:20:15 +0000
+++ drizzled/field/date.cc	2011-01-27 20:14:35 +0000
@@ -74,7 +74,7 @@
   DateTime temporal;
   if (! temporal.from_string(from, (size_t) len))
   {
-    my_error(ER_INVALID_DATETIME_VALUE, MYF(ME_FATALERROR), from);
+    my_error(ER_INVALID_DATE_VALUE, MYF(ME_FATALERROR), from);
     return 2;
   }
   /* Create the stored integer format. @TODO This should go away. Should be up to engine... */
@@ -94,7 +94,7 @@
     ss.precision(18); /* 18 places should be fine for error display of double input. */
     ss << from; ss >> tmp;
 
-    my_error(ER_INVALID_DATETIME_VALUE, MYF(ME_FATALERROR), tmp.c_str());
+    my_error(ER_INVALID_DATE_VALUE, MYF(ME_FATALERROR), tmp.c_str());
     return 2;
   }
   return Field_date::store((int64_t) rint(from), false);
@@ -113,13 +113,14 @@
     /* Convert the integer to a string using boost::lexical_cast */
     std::string tmp(boost::lexical_cast<std::string>(from)); 
 
-    my_error(ER_INVALID_DATETIME_VALUE, MYF(ME_FATALERROR), tmp.c_str());
+    my_error(ER_INVALID_DATE_VALUE, MYF(ME_FATALERROR), tmp.c_str());
     return 2;
   }
 
   /* Create the stored integer format. @TODO This should go away. Should be up to engine... */
   uint32_t int_value= (temporal.years() * 10000) + (temporal.months() * 100) + temporal.days();
   int4store(ptr, int_value);
+
   return 0;
 }
 
 
=== modified file 'drizzled/field/time.cc'
--- drizzled/field/time.cc	2011-01-25 05:20:15 +0000
+++ drizzled/field/time.cc	2011-01-27 20:14:35 +0000
@@ -82,7 +82,8 @@
 
   if (not temporal.from_string(from, (size_t) len))
   {
-    my_error(ER_INVALID_UNIX_TIMESTAMP_VALUE, MYF(ME_FATALERROR), from);
+    std::string tmp(boost::lexical_cast<std::string>(from));
+    my_error(ER_INVALID_TIME_VALUE, MYF(0), tmp.c_str());
     return 1;
   }
 
@@ -94,44 +95,42 @@
 int Time::store(double from)
 { 
   ASSERT_COLUMN_MARKED_FOR_WRITE;
-  int64_t tmp;
-  int error= 0;
-
-  if (from > (double)TIME_MAX_VALUE)
-  { 
-    tmp= TIME_MAX_VALUE;
-    set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN,
-                         ER_WARN_DATA_OUT_OF_RANGE, from, type::DRIZZLE_TIMESTAMP_TIME);
-    error= 1;
-  }
-  else if (from < (double) - TIME_MAX_VALUE)
-  { 
-    tmp= -TIME_MAX_VALUE;
-    set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN,
-                         ER_WARN_DATA_OUT_OF_RANGE, from, type::DRIZZLE_TIMESTAMP_TIME);
-    error= 1;
-  }
-  else
-  { 
-    tmp=(long) floor(fabs(from));                 // Remove fractions
-
-    if (from < 0)
-      tmp= -tmp;
-
-    if (tmp % 100 > 59 || tmp/100 % 100 > 59)
-    { 
-      tmp=0;
-      set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN,
-                           ER_WARN_DATA_OUT_OF_RANGE, from,
-                           type::DRIZZLE_TIMESTAMP_TIME);
-      error= 1;
-    }
-  }
-
-  if (not error)
+
+  do
+  {
+    int64_t tmp;
+
+    if (from > (double)TIME_MAX_VALUE)
+    { 
+      tmp= TIME_MAX_VALUE;
+      break;
+    }
+    else if (from < (double) - TIME_MAX_VALUE)
+    { 
+      tmp= -TIME_MAX_VALUE;
+      break;
+    }
+    else
+    { 
+      tmp=(long) floor(fabs(from));                 // Remove fractions
+
+      if (from < 0)
+        tmp= -tmp;
+
+      if (tmp % 100 > 59 || tmp/100 % 100 > 59)
+      { 
+        break;
+      }
+    }
+
     return store(tmp, false);
 
-  return error;
+  } while (0);
+
+  std::string tmp(boost::lexical_cast<std::string>(from));
+  my_error(ER_INVALID_TIME_VALUE, MYF(0), tmp.c_str());
+
+  return 1;
 }
 
 int Time::store(int64_t from, bool)
@@ -143,12 +142,11 @@
    * if unable to create a valid DateTime.  
    */
   drizzled::Time temporal;
-  if (! temporal.from_time_t(from))
+  if (not temporal.from_time_t(from))
   {
     /* Convert the integer to a string using boost::lexical_cast */
     std::string tmp(boost::lexical_cast<std::string>(from));
-
-    my_error(ER_INVALID_UNIX_TIMESTAMP_VALUE, MYF(ME_FATALERROR), tmp.c_str());
+    my_error(ER_INVALID_TIME_VALUE, MYF(0), tmp.c_str());
     return 2;
   }
 
 
=== modified file 'drizzled/function/time/typecast.h'
--- drizzled/function/time/typecast.h	2011-01-25 05:20:15 +0000
+++ drizzled/function/time/typecast.h	2011-01-27 20:14:35 +0000
@@ -87,33 +87,40 @@
 public:
   using Item_func::tmp_table_field;
 
-  Item_date_typecast(Item *a) :Item_typecast_maybe_null(a) {}
+  Item_date_typecast(Item *a) :
+    Item_typecast_maybe_null(a)
+  {}
+
   const char *func_name() const { return "cast_as_date"; }
   String *val_str(String *str);
   bool get_date(type::Time &ltime, uint32_t fuzzy_date);
   bool get_time(type::Time &ltime);
   const char *cast_type() const { return "date"; }
   enum_field_types field_type() const { return DRIZZLE_TYPE_DATE; }
+
   Field *tmp_table_field(Table *table)
   {
     return tmp_table_field_from_field_type(table, 0);
   }
+
   void fix_length_and_dec()
   {
     collation.set(&my_charset_bin);
     max_length= 10;
     maybe_null= 1;
   }
+
   bool result_as_int64_t() { return true; }
   int64_t val_int();
   double val_real() { return (double) val_int(); }
+
   type::Decimal *val_decimal(type::Decimal *decimal_value)
   {
     assert(fixed == 1);
     return  val_decimal_from_date(decimal_value);
   }
-  int save_in_field(Field *field,
-                    bool )
+
+  int save_in_field(Field *field, bool )
   {
     return save_date_in_field(field);
   }
 
=== modified file 'drizzled/type/time.h'
--- drizzled/type/time.h	2011-01-25 05:20:15 +0000
+++ drizzled/type/time.h	2011-01-27 20:14:35 +0000
@@ -102,6 +102,7 @@
   datatime_t while being stored in an integer is actually a formatted value.
 */
 typedef int64_t datetime_t;
+typedef int64_t date_t;
 
 inline bool is_valid(const datetime_t &value)
 {
 
=== modified file 'plugin/transaction_log/tests/r/transaction_log_data_type.result'
--- plugin/transaction_log/tests/r/transaction_log_data_type.result	2011-01-20 06:31:31 +0000
+++ plugin/transaction_log/tests/r/transaction_log_data_type.result	2011-01-27 20:14:35 +0000
@@ -2356,7 +2356,7 @@
 
 Testing MIN-1 DATE
 INSERT INTO t1 (b) VALUES('0000-12-31');
-ERROR HY000: Received an invalid datetime value '0000-12-31'.
+ERROR HY000: Received an invalid DATE value '0000-12-31'.
 Check transaction_log_entries
 SELECT COUNT(*) FROM DATA_DICTIONARY.TRANSACTION_LOG_ENTRIES;
 COUNT(*)
@@ -2411,7 +2411,7 @@
 
 Testing MAX+1 DATE
 INSERT INTO t1 (b) VALUES('10000-01-01');
-ERROR HY000: Received an invalid datetime value '10000-01-01'.
+ERROR HY000: Received an invalid DATE value '10000-01-01'.
 Check transaction_log_entries
 SELECT COUNT(*) FROM DATA_DICTIONARY.TRANSACTION_LOG_ENTRIES;
 COUNT(*)
@@ -2628,7 +2628,7 @@
 
 Testing BAD INPUT DATE1
 INSERT INTO t1 (b) VALUES('abbazabba');
-ERROR HY000: Received an invalid datetime value 'abbazabba'.
+ERROR HY000: Received an invalid DATE value 'abbazabba'.
 Check transaction_log_entries
 SELECT COUNT(*) FROM DATA_DICTIONARY.TRANSACTION_LOG_ENTRIES;
 COUNT(*)
@@ -2683,7 +2683,7 @@
 
 Testing BAD INPUT DATE2
 INSERT INTO t1 (b) VALUES('a');
-ERROR HY000: Received an invalid datetime value 'a'.
+ERROR HY000: Received an invalid DATE value 'a'.
 Check transaction_log_entries
 SELECT COUNT(*) FROM DATA_DICTIONARY.TRANSACTION_LOG_ENTRIES;
 COUNT(*)
 
=== modified file 'plugin/transaction_log/tests/t/transaction_log_data_type.test'
--- plugin/transaction_log/tests/t/transaction_log_data_type.test	2011-01-20 06:31:31 +0000
+++ plugin/transaction_log/tests/t/transaction_log_data_type.test	2011-01-27 20:14:35 +0000
@@ -340,13 +340,13 @@
 --echo
 
 --echo Testing MIN-1 DATE
---ERROR 1686 
+--ERROR ER_INVALID_DATE_VALUE 
 INSERT INTO t1 (b) VALUES('0000-12-31');
 --source ../plugin/transaction_log/tests/t/check_transaction_log.inc
 --echo
 
 --echo Testing MAX+1 DATE
---ERROR 1686 
+--ERROR ER_INVALID_DATE_VALUE 
 INSERT INTO t1 (b) VALUES('10000-01-01');
 --source ../plugin/transaction_log/tests/t/check_transaction_log.inc
 --echo
@@ -367,13 +367,13 @@
 --echo
 
 --echo Testing BAD INPUT DATE1
---ERROR 1686
+--ERROR ER_INVALID_DATE_VALUE
 INSERT INTO t1 (b) VALUES('abbazabba');
 --source ../plugin/transaction_log/tests/t/check_transaction_log.inc
 --echo
 
 --echo Testing BAD INPUT DATE2
---ERROR 1686 
+--ERROR ER_INVALID_DATE_VALUE 
 INSERT INTO t1 (b) VALUES('a');
 --source ../plugin/transaction_log/tests/t/check_transaction_log.inc
 --echo
@@ -402,13 +402,13 @@
 --echo
 
 --echo Testing MIN-1 DATETIME
---ERROR 1686 
+--ERROR ER_INVALID_DATETIME_VALUE 
 INSERT INTO t1 (b) VALUES('0000-01-01');
 --source ../plugin/transaction_log/tests/t/check_transaction_log.inc
 --echo
 
 --echo Testing MAX+1 DATETIME
---ERROR 1686 
+--ERROR ER_INVALID_DATETIME_VALUE 
 INSERT INTO t1 (b) VALUES('10000-01-01');
 --source ../plugin/transaction_log/tests/t/check_transaction_log.inc
 --echo
@@ -429,19 +429,19 @@
 --echo
 
 --echo Testing BAD INPUT DATETIME1
---ERROR 1686
+--ERROR ER_INVALID_DATETIME_VALUE
 INSERT INTO t1 (b) VALUES('2000-01-01 25:00:00');
 --source ../plugin/transaction_log/tests/t/check_transaction_log.inc
 --echo
 
 --echo Testing BAD INPUT DATETIME2
---ERROR 1686 
+--ERROR ER_INVALID_DATETIME_VALUE 
 INSERT INTO t1 (b) VALUES('2000-01-01 12:60:00');
 --source ../plugin/transaction_log/tests/t/check_transaction_log.inc
 --echo
 
 --echo Testing BAD INPUT DATETIME3
---ERROR 1686 
+--ERROR ER_INVALID_DATETIME_VALUE 
 INSERT INTO t1 (b) VALUES('2000-01-01 12:00:70');
 --source ../plugin/transaction_log/tests/t/check_transaction_log.inc
 --echo
 
=== modified file 'tests/r/func_time.result'
--- tests/r/func_time.result	2011-01-20 06:31:31 +0000
+++ tests/r/func_time.result	2011-01-27 20:14:35 +0000
@@ -348,7 +348,7 @@
 create table t1 (d date, dt datetime, t timestamp, c char(10));
 insert into t1 values (null, null, null, null);
 insert into t1 values ("0000-00-00", "0000-00-00", "0000-00-00", "0000-00-00");
-ERROR HY000: Received an invalid datetime value '0000-00-00'.
+ERROR HY000: Received an invalid DATE value '0000-00-00'.
 select dayofyear("0000-00-00"),dayofyear(d),dayofyear(dt),dayofyear(t),dayofyear(c) from t1;
 ERROR HY000: Received an invalid datetime value '0000-00-00'.
 select dayofmonth("0000-00-00"),dayofmonth(d),dayofmonth(dt),dayofmonth(t),dayofmonth(c) from t1;
 
=== modified file 'tests/r/select.result'
--- tests/r/select.result	2010-12-02 06:58:45 +0000
+++ tests/r/select.result	2011-01-27 20:14:35 +0000
@@ -2818,7 +2818,7 @@
 insert into t1 values(1,'2005-01-01'),(2,'2005-09-01'),(3,'2005-09-30'),
 (4,'2005-10-01'),(5,'2005-12-30');
 select * from t1 where f2 >= 0            order by f2;
-ERROR HY000: Received an invalid datetime value '0'.
+ERROR HY000: Received an invalid DATE value '0'.
 select * from t1 where f2 >= '0000-00-00' order by f2;
 ERROR HY000: Received an invalid datetime value '0000-00-00'.
 select * from t1 where f2 >= '2005-09-31' order by f2;
 
=== modified file 'tests/r/type_date.result'
--- tests/r/type_date.result	2009-02-21 16:00:06 +0000
+++ tests/r/type_date.result	2011-01-27 20:14:35 +0000
@@ -112,10 +112,10 @@
 @d:=1311
 1311
 select year(@d), month(@d), day(@d), cast(@d as date);
-ERROR HY000: Received an invalid datetime value '1311'.
+Got one of the listed errors
 create table t1 (d  date , dt datetime , ts timestamp);
 insert into t1 values (9912101,9912101,9912101);
-ERROR HY000: Received an invalid datetime value '9912101'.
+ERROR HY000: Received an invalid DATE value '9912101'.
 insert into t1 values (11111,11111,11111);
 select * from t1;
 d	dt	ts
 
=== modified file 'tests/r/type_datetime.result'
--- tests/r/type_datetime.result	2011-01-18 00:08:34 +0000
+++ tests/r/type_datetime.result	2011-01-27 20:14:35 +0000
@@ -187,7 +187,7 @@
 insert into t1 values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
 insert into t1 set dt='2007-03-23 13:49:38',da=dt;
 insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
-ERROR HY000: Received an invalid datetime value '2007-03-32'.
+ERROR HY000: Received an invalid DATE value '2007-03-32'.
 select * from t1;
 da	dt
 1962-03-03	1962-03-03 00:00:00
@@ -457,7 +457,7 @@
 insert into t1 values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
 insert into t1 set dt='2007-03-23 13:49:38',da=dt;
 insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
-ERROR HY000: Received an invalid datetime value '2007-03-32'.
+ERROR HY000: Received an invalid DATE value '2007-03-32'.
 select * from t1;
 da	dt
 1962-03-03	1962-03-03 00:00:00
 
=== modified file 'tests/suite/time_type/r/basic.result'
--- tests/suite/time_type/r/basic.result	2010-12-22 17:43:15 +0000
+++ tests/suite/time_type/r/basic.result	2011-01-27 20:14:35 +0000
@@ -6,15 +6,15 @@
 INSERT INTO t1 VALUES (1234);
 INSERT INTO t1 VALUES (123456.78);
 INSERT INTO t1 VALUES (1234559.99);
-ERROR HY000: Received an invalid value '1234559.99' for a UNIX timestamp.
+ERROR HY000: Received an invalid TIME value '1234559.99'.
 INSERT INTO t1 VALUES ("1");
 INSERT INTO t1 VALUES ("1:23");
 INSERT INTO t1 VALUES ("1:23:45");
 INSERT INTO t1 VALUES ("10.22");
 INSERT INTO t1 VALUES ("20 10:22:33");
-ERROR HY000: Received an invalid value '20 10:22:33' for a UNIX timestamp.
+ERROR HY000: Received an invalid TIME value '20 10:22:33'.
 INSERT INTO t1 VALUES ("-10  1:22:33.45");
-ERROR HY000: Received an invalid value '-10  1:22:33.45' for a UNIX timestamp.
+ERROR HY000: Received an invalid TIME value '-10  1:22:33.45'.
 INSERT INTO t1 VALUES ("1999-02-03 20:33:34");
 insert t1 values (30);
 insert t1 values (1230);
@@ -22,52 +22,52 @@
 insert t1 values ("12:30");
 insert t1 values ("12:30:35");
 insert t1 values ("1 12:30:31.32");
-ERROR HY000: Received an invalid value '1 12:30:31.32' for a UNIX timestamp.
-select * from t1;
+ERROR HY000: Received an invalid TIME value '1 12:30:31.32'.
+select t from t1;
 t
-10:22:33
-12:34:56
-00:00:10
-00:20:34
-12:34:56
 00:00:01
+00:00:10
+00:00:10
+00:00:30
 00:01:23
+00:12:30
+00:12:30
+00:20:30
+00:20:34
 01:23:45
-00:00:10
+10:22:33
+12:30:35
+12:34:56
+12:34:56
 20:33:34
-00:00:30
-00:20:30
-00:12:30
-00:12:30
-12:30:35
 INSERT INTO t1 VALUES ("10.22.22");
-ERROR HY000: Received an invalid value '10.22.22' for a UNIX timestamp.
+ERROR HY000: Received an invalid TIME value '10.22.22'.
 INSERT INTO t1 VALUES (1234567);
 INSERT INTO t1 VALUES (123456789);
 INSERT INTO t1 VALUES (123456789.10);
-ERROR HY000: Received an invalid value '123456789.10' for a UNIX timestamp.
+ERROR HY000: Received an invalid TIME value '123456789.10'.
 INSERT INTO t1 VALUES ("10 22:22");
-ERROR HY000: Received an invalid value '10 22:22' for a UNIX timestamp.
+ERROR HY000: Received an invalid TIME value '10 22:22'.
 INSERT INTO t1 VALUES ("12.45a");
-ERROR HY000: Received an invalid value '12.45a' for a UNIX timestamp.
-select * from t1;
+ERROR HY000: Received an invalid TIME value '12.45a'.
+select t from t1;
 t
-10:22:33
-12:34:56
-00:00:10
-00:20:34
-12:34:56
 00:00:01
+00:00:10
+00:00:10
+00:00:30
 00:01:23
+00:12:30
+00:12:30
+00:20:30
+00:20:34
 01:23:45
-00:00:10
-20:33:34
-00:00:30
-00:20:30
-00:12:30
-00:12:30
-12:30:35
 06:56:07
+10:22:33
+12:30:35
+12:34:56
+12:34:56
+20:33:34
 21:33:09
 DROP TABLE t1;
 CREATE TABLE t1 (t time);
@@ -106,14 +106,14 @@
 1
 CREATE TABLE t1 (f1 time);
 INSERT INTO t1 VALUES ('24:00:00');
-ERROR HY000: Received an invalid value '24:00:00' for a UNIX timestamp.
+ERROR HY000: Received an invalid TIME value '24:00:00'.
 SELECT CAST('24:00:00' as time) = (select f1 from t1);
 CAST('24:00:00' as time) = (select f1 from t1)
 NULL
 DROP TABLE t1;
 CREATE TABLE t1(f1 time, f2 time);
 INSERT INTO t1 VALUES('20:00:00','150:00:00');
-ERROR HY000: Received an invalid value '150:00:00' for a UNIX timestamp.
+ERROR HY000: Received an invalid TIME value '150:00:00'.
 select 1 from t1 where cast('100:00:00' as time) between f1 and f2;
 1
 DROP TABLE t1;
 
=== modified file 'tests/suite/time_type/t/basic.test'
--- tests/suite/time_type/t/basic.test	2010-12-22 17:43:15 +0000
+++ tests/suite/time_type/t/basic.test	2011-01-27 20:14:35 +0000
@@ -16,7 +16,7 @@
 
 INSERT INTO t1 VALUES (123456.78);
 
---error ER_INVALID_UNIX_TIMESTAMP_VALUE
+--error ER_INVALID_TIME_VALUE
 INSERT INTO t1 VALUES (1234559.99);
 
 INSERT INTO t1 VALUES ("1");
@@ -27,10 +27,10 @@
 
 INSERT INTO t1 VALUES ("10.22");
 
---error ER_INVALID_UNIX_TIMESTAMP_VALUE
+--error ER_INVALID_TIME_VALUE
 INSERT INTO t1 VALUES ("20 10:22:33");
 
---error ER_INVALID_UNIX_TIMESTAMP_VALUE
+--error ER_INVALID_TIME_VALUE
 INSERT INTO t1 VALUES ("-10  1:22:33.45");
 
 INSERT INTO t1 VALUES ("1999-02-03 20:33:34");
@@ -40,27 +40,29 @@
 insert t1 values ("1230");
 insert t1 values ("12:30");
 insert t1 values ("12:30:35");
---error ER_INVALID_UNIX_TIMESTAMP_VALUE
+--error ER_INVALID_TIME_VALUE
 insert t1 values ("1 12:30:31.32");
 
-select * from t1;
+--sorted_result
+select t from t1;
 # Test wrong values
---error ER_INVALID_UNIX_TIMESTAMP_VALUE
+--error ER_INVALID_TIME_VALUE
 INSERT INTO t1 VALUES ("10.22.22");
 
 INSERT INTO t1 VALUES (1234567);
 
 INSERT INTO t1 VALUES (123456789);
 
---error ER_INVALID_UNIX_TIMESTAMP_VALUE
+--error ER_INVALID_TIME_VALUE
 INSERT INTO t1 VALUES (123456789.10);
 
---error ER_INVALID_UNIX_TIMESTAMP_VALUE
+--error ER_INVALID_TIME_VALUE
 INSERT INTO t1 VALUES ("10 22:22");
 
---error ER_INVALID_UNIX_TIMESTAMP_VALUE
+--error ER_INVALID_TIME_VALUE
 INSERT INTO t1 VALUES ("12.45a");
-select * from t1;
+--sorted_result
+select t from t1;
 DROP TABLE t1;
 
 CREATE TABLE t1 (t time);
@@ -119,7 +121,7 @@
 SELECT CAST('300:55:50' as time) > cast('240:00:00' as time);
 
 CREATE TABLE t1 (f1 time);
---error ER_INVALID_UNIX_TIMESTAMP_VALUE
+--error ER_INVALID_TIME_VALUE
 INSERT INTO t1 VALUES ('24:00:00');
 
 SELECT CAST('24:00:00' as time) = (select f1 from t1);
@@ -130,7 +132,7 @@
 # Bug#29739: Incorrect time comparison in BETWEEN.
 #
 CREATE TABLE t1(f1 time, f2 time);
---error ER_INVALID_UNIX_TIMESTAMP_VALUE
+--error ER_INVALID_TIME_VALUE
 INSERT INTO t1 VALUES('20:00:00','150:00:00');
 
 select 1 from t1 where cast('100:00:00' as time) between f1 and f2;
 
=== modified file 'tests/t/func_time.test'
--- tests/t/func_time.test	2011-01-20 06:31:31 +0000
+++ tests/t/func_time.test	2011-01-27 20:14:35 +0000
@@ -173,20 +173,28 @@
 
 create table t1 (d date, dt datetime, t timestamp, c char(10));
 insert into t1 values (null, null, null, null);
---error ER_INVALID_DATETIME_VALUE # Bad dates...
+
+--error ER_INVALID_DATE_VALUE # Bad dates...
 insert into t1 values ("0000-00-00", "0000-00-00", "0000-00-00", "0000-00-00");
+
 --error ER_INVALID_DATETIME_VALUE # 0000-00-00 is a bad date
 select dayofyear("0000-00-00"),dayofyear(d),dayofyear(dt),dayofyear(t),dayofyear(c) from t1;
+
 --error ER_INVALID_DATETIME_VALUE # 0000-00-00 is a bad date
 select dayofmonth("0000-00-00"),dayofmonth(d),dayofmonth(dt),dayofmonth(t),dayofmonth(c) from t1;
+
 --error ER_INVALID_DATETIME_VALUE # 0000-00-00 is not a damn date.
 select month("0000-00-00"),month(d),month(dt),month(t),month(c) from t1;
+
 --error ER_INVALID_DATETIME_VALUE # 0000-00-00 not a date
 select quarter("0000-00-00"),quarter(d),quarter(dt),quarter(t),quarter(c) from t1;
+
 --error ER_INVALID_DATETIME_VALUE # Argh.  0000-00-00 is not a date.
 select year("0000-00-00"),year(d),year(dt),year(t),year(c) from t1;
+
 --error ER_INVALID_DATETIME_VALUE # Bad datetime
 select to_days("0000-00-00"),to_days(d),to_days(dt),to_days(c) from t1;
+
 --error ER_INVALID_DATETIME_VALUE # Ugh. bad datetime
 select extract(MONTH FROM "0000-00-00"),extract(MONTH FROM d),extract(MONTH FROM dt),extract(MONTH FROM t),extract(MONTH FROM c) from t1;
 drop table t1;
 
=== modified file 'tests/t/select.test'
--- tests/t/select.test	2011-01-26 00:31:58 +0000
+++ tests/t/select.test	2011-01-27 20:14:35 +0000
@@ -2589,7 +2589,7 @@
 insert into t1 values(1,'2005-01-01'),(2,'2005-09-01'),(3,'2005-09-30'),
   (4,'2005-10-01'),(5,'2005-12-30');
 # should return all records
---error ER_INVALID_DATETIME_VALUE # Bad date
+--error ER_INVALID_DATE_VALUE # Bad date
 select * from t1 where f2 >= 0            order by f2;
 --error ER_INVALID_DATETIME_VALUE # Bad date
 select * from t1 where f2 >= '0000-00-00' order by f2;
 
=== modified file 'tests/t/type_date.test'
--- tests/t/type_date.test	2010-08-26 21:56:15 +0000
+++ tests/t/type_date.test	2011-01-27 20:14:35 +0000
@@ -117,10 +117,10 @@
 select @d:=011111;
 select year(@d), month(@d), day(@d), cast(@d as date);
 select @d:=1311;
---error ER_INVALID_DATETIME_VALUE # Invalid datetime of 1311
+--error ER_INVALID_DATE_VALUE,ER_INVALID_DATETIME_VALUE # Invalid datetime of 1311
 select year(@d), month(@d), day(@d), cast(@d as date);
 create table t1 (d  date , dt datetime , ts timestamp);
--- error 1686 # Bad dates
+--error ER_INVALID_DATE_VALUE # Bad dates
 insert into t1 values (9912101,9912101,9912101);
 insert into t1 values (11111,11111,11111);
 select * from t1;
 
=== modified file 'tests/t/type_datetime.test'
--- tests/t/type_datetime.test	2010-08-26 21:56:15 +0000
+++ tests/t/type_datetime.test	2011-01-27 20:14:35 +0000
@@ -190,7 +190,7 @@
 insert into t1 values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
 insert into t1 set dt='2007-03-23 13:49:38',da=dt;
 # Test error handling
---error ER_INVALID_DATETIME_VALUE # Bad date
+--error ER_INVALID_DATE_VALUE # Bad date
 insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
 select * from t1;
 drop table t1;
@@ -369,7 +369,7 @@
 insert into t1 values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
 insert into t1 set dt='2007-03-23 13:49:38',da=dt;
 # Test error handling
---error ER_INVALID_DATETIME_VALUE # Bad date
+--error ER_INVALID_DATE_VALUE # Bad date
 insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
 select * from t1;
 drop table t1;