database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

Browse Source 
into  moonbone.local:/mnt/gentoo64/work/29898-bug-5.0-opt-mysql
This commit is contained in:
unknown
2007-07-20 22:05:20 +04:00
parent db31d3c96d a131428f04
commit d758b1e629
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/r/cast.result
View File

@ -403,4 +403,15 @@ hex(cast('a' as binary(2)))
select hex(cast('a' as char(2) binary)); select hex(cast('a' as char(2) binary));
hex(cast('a' as char(2) binary)) hex(cast('a' as char(2) binary))
61 61
CREATE TABLE t1 (d1 datetime);
INSERT INTO t1(d1) VALUES ('2007-07-19 08:30:00'), (NULL),
('2007-07-19 08:34:00'), (NULL), ('2007-07-19 08:36:00');
SELECT cast(date(d1) as signed) FROM t1;
cast(date(d1) as signed)
20070719
NULL
20070719
NULL
20070719
drop table t1;
End of 5.0 tests End of 5.0 tests

9
mysql-test/t/cast.test
View File

@ -237,4 +237,13 @@ select hex(cast('a' as char(2) binary));
select hex(cast('a' as binary(2))); select hex(cast('a' as binary(2)));
select hex(cast('a' as char(2) binary)); select hex(cast('a' as char(2) binary));
#
# Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag.
#
CREATE TABLE t1 (d1 datetime);
INSERT INTO t1(d1) VALUES ('2007-07-19 08:30:00'), (NULL),
('2007-07-19 08:34:00'), (NULL), ('2007-07-19 08:36:00');
SELECT cast(date(d1) as signed) FROM t1;
drop table t1;
--echo End of 5.0 tests --echo End of 5.0 tests

5
sql/item_timefunc.cc
View File

@ -2662,11 +2662,8 @@ longlong Item_date_typecast::val_int()
{ {
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
MYSQL_TIME ltime; MYSQL_TIME ltime;
if (args[0]->get_date(&ltime, TIME_FUZZY_DATE)) if ((null_value= 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);
} }