Commit 3f0f2750 authored by tnurnberg@mysql.com/white.intern.koehntopp.de's avatar tnurnberg@mysql.com/white.intern.koehntopp.de
Browse files

Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE 

HOUR(), MINUTE(), ... returned spurious results when used on a DATE-cast.
This happened because DATE-cast object did not overload get_time() method
in superclass Item. The default method was inappropriate here and
misinterpreted the data.

Patch adds missing method; get_time() on DATE-casts now returns SQL-NULL
on NULL input, 0 otherwise. This coincides with the way DATE-columns
behave.

Also fixes similar bug in Date-Field now.
parent b1e77cfc

mysql-test/r/cast.result

+24 −0
Original line number Diff line number Diff line
@@ -414,4 +414,28 @@ NULL 
NULL

20070719

drop table t1;

CREATE TABLE t1 (f1 DATE);

INSERT INTO t1 VALUES ('2007-07-19'), (NULL);

SELECT HOUR(f1),

MINUTE(f1),

SECOND(f1) FROM t1;

HOUR(f1)	MINUTE(f1)	SECOND(f1)

0	0	0

NULL	NULL	NULL

SELECT HOUR(CAST('2007-07-19' AS DATE)),

MINUTE(CAST('2007-07-19' AS DATE)),

SECOND(CAST('2007-07-19' AS DATE));

HOUR(CAST('2007-07-19' AS DATE))	MINUTE(CAST('2007-07-19' AS DATE))	SECOND(CAST('2007-07-19' AS DATE))

0	0	0

SELECT HOUR(CAST(NULL AS DATE)),

MINUTE(CAST(NULL AS DATE)),

SECOND(CAST(NULL AS DATE));

HOUR(CAST(NULL AS DATE))	MINUTE(CAST(NULL AS DATE))	SECOND(CAST(NULL AS DATE))

NULL	NULL	NULL

SELECT HOUR(NULL),

MINUTE(NULL),

SECOND(NULL);

HOUR(NULL)	MINUTE(NULL)	SECOND(NULL)

NULL	NULL	NULL

DROP TABLE t1;

End of 5.0 tests

mysql-test/r/type_date.result

+5 −0
Original line number Diff line number Diff line
@@ -214,4 +214,9 @@ INSERT INTO t1 VALUES ('0000-00-00'); 
ERROR 22007: Incorrect date value: '0000-00-00' for column 'a' at row 1

SET SQL_MODE=DEFAULT;

DROP TABLE t1,t2;

CREATE TABLE t1 SELECT curdate() AS f1;

SELECT hour(f1), minute(f1), second(f1) FROM t1;

hour(f1)	minute(f1)	second(f1)

0	0	0

DROP TABLE t1;

End of 5.0 tests

mysql-test/t/cast.test

+22 −0
Original line number Diff line number Diff line
@@ -246,4 +246,26 @@ INSERT INTO t1(d1) VALUES ('2007-07-19 08:30:00'), (NULL), 
SELECT cast(date(d1) as signed) FROM t1;

drop table t1;



#

# Bug #31990: MINUTE() and SECOND() return bogus results when used on a DATE

#



# Show that HH:MM:SS of a DATE are 0, and that it's the same for columns

# and typecasts (NULL in, NULL out).

CREATE TABLE t1 (f1 DATE);

INSERT INTO t1 VALUES ('2007-07-19'), (NULL);

SELECT HOUR(f1),

       MINUTE(f1),

       SECOND(f1) FROM t1;

SELECT HOUR(CAST('2007-07-19' AS DATE)),

       MINUTE(CAST('2007-07-19' AS DATE)),

       SECOND(CAST('2007-07-19' AS DATE));

SELECT HOUR(CAST(NULL AS DATE)),

       MINUTE(CAST(NULL AS DATE)),

       SECOND(CAST(NULL AS DATE));

SELECT HOUR(NULL),

       MINUTE(NULL),

       SECOND(NULL);

DROP TABLE t1;



--echo End of 5.0 tests

mysql-test/t/type_date.test

+8 −0
Original line number Diff line number Diff line
@@ -190,4 +190,12 @@ INSERT INTO t1 VALUES ('0000-00-00'); 
SET SQL_MODE=DEFAULT;

DROP TABLE t1,t2;



#

# Bug #31990: MINUTE() and SECOND() return bogus results when used on a DATE

#



CREATE TABLE t1 SELECT curdate() AS f1;

SELECT hour(f1), minute(f1), second(f1) FROM t1;

DROP TABLE t1;



--echo End of 5.0 tests

sql/field.cc

+7 −0
Original line number Diff line number Diff line
@@ -5194,6 +5194,13 @@ String *Field_date::val_str(String *val_buffer, 
}





bool Field_date::get_time(MYSQL_TIME *ltime)

{

  bzero((char *)ltime, sizeof(MYSQL_TIME));

  return 0;

}





int Field_date::cmp(const char *a_ptr, const char *b_ptr)

{

  int32 a,b;