bzr push into mysql-trunk branch (alexander.barkov:3555 to 3556) WL#946

[Alexander Barkov]

 3556 Alexander Barkov	2011-11-10
      WL#946 13367868  has quoted fsp

    modified:
      mysql-test/r/temporal_literal.result
      mysql-test/t/temporal_literal.test
      sql/item_create.cc
 3555 Alexander Barkov	2011-11-10
      WL#946: Bug#13359097 ASSERT FAILURE IN MAKE_SORTKEY

    modified:
      mysql-test/r/type_temporal_fractional.result
      mysql-test/t/type_temporal_fractional.test
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_row.h
      sql/item_strfunc.h
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/item_sum.cc
      sql/item_sum.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/procedure.h
=== modified file 'mysql-test/r/temporal_literal.result'
--- a/mysql-test/r/temporal_literal.result	2011-11-01 11:52:24 +0000
+++ b/mysql-test/r/temporal_literal.result	2011-11-10 15:14:11 +0000
@@ -93,6 +93,8 @@ TIME'1 24:00:00'
 SELECT TIME'30 24:00:00';
 TIME'30 24:00:00'
 744:00:00
+SELECT TIME'0000-00-00 00:00:00';
+ERROR HY000: Incorrect TIME value: '0000-00-00 00:00:00'
 SELECT TIME'40 24:00:00';
 ERROR HY000: Incorrect TIME value: '40 24:00:00'
 SELECT TIME'10';

=== modified file 'mysql-test/t/temporal_literal.test'
--- a/mysql-test/t/temporal_literal.test	2011-11-01 11:52:24 +0000
+++ b/mysql-test/t/temporal_literal.test	2011-11-10 15:14:11 +0000
@@ -65,6 +65,8 @@ SELECT TIME'-900:00:00';
 SELECT TIME'1 24:00:00';
 SELECT TIME'30 24:00:00';
 --error ER_WRONG_VALUE
+SELECT TIME'0000-00-00 00:00:00';
+--error ER_WRONG_VALUE
 SELECT TIME'40 24:00:00';
 SELECT TIME'10';
 SELECT TIME'10:10';

=== modified file 'sql/item_create.cc'
--- a/sql/item_create.cc	2011-11-01 11:52:24 +0000
+++ b/sql/item_create.cc	2011-11-10 15:14:11 +0000
@@ -5807,7 +5807,7 @@ Item *create_temporal_literal(THD *thd,
     break;
   case MYSQL_TYPE_TIME:
     if (!str_to_time(cs, str, length, &ltime, 0, &status) &&
-        !status.warnings)
+        ltime.time_type == MYSQL_TIMESTAMP_TIME && !status.warnings)
       item= new (thd->mem_root) Item_time_literal(&ltime,
                                                   status.fractional_digits);
     break;

No bundle (reason: useless for push emails).