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

into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
parents 64a728ce c99556d5
...@@ -278,3 +278,7 @@ double_val cast_val ...@@ -278,3 +278,7 @@ double_val cast_val
-1e+30 -9223372036854775808 -1e+30 -9223372036854775808
1e+30 9223372036854775807 1e+30 9223372036854775807
DROP TABLE t1; DROP TABLE t1;
select isnull(date(NULL)), isnull(cast(NULL as DATE));
isnull(date(NULL)) isnull(cast(NULL as DATE))
1 1
End of 4.1 tests
...@@ -167,4 +167,10 @@ INSERT INTO t1 SET f1 = +1.0e+30 ; ...@@ -167,4 +167,10 @@ INSERT INTO t1 SET f1 = +1.0e+30 ;
SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1; SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1;
DROP TABLE t1; DROP TABLE t1;
# End of 4.1 tests #
# Bug #23938: cast(NULL as DATE)
#
select isnull(date(NULL)), isnull(cast(NULL as DATE));
--echo End of 4.1 tests
...@@ -2491,7 +2491,10 @@ longlong Item_date_typecast::val_int() ...@@ -2491,7 +2491,10 @@ longlong Item_date_typecast::val_int()
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
TIME ltime; TIME ltime;
if (args[0]->get_date(&ltime, TIME_FUZZY_DATE)) if (args[0]->get_date(&ltime, TIME_FUZZY_DATE))
{
null_value= 1;
return 0; return 0;
}
return (longlong) (ltime.year * 10000L + ltime.month * 100 + ltime.day); return (longlong) (ltime.year * 10000L + ltime.month * 100 + ltime.day);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment