1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  mysql.com:/misc/mysql/31990/50-31990
This commit is contained in:
tnurnberg@white.intern.koehntopp.de 2007-12-20 08:35:52 +01:00
commit d1637b2ec4
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/type_date.result
View File

@ -251,4 +251,9 @@ INSERT INTO t1 VALUES ('1000-00-00');
ERROR 22007: Incorrect date value: '1000-00-00' for column 'a' at row 1 ERROR 22007: Incorrect date value: '1000-00-00' for column 'a' at row 1
SET SQL_MODE=DEFAULT; SET SQL_MODE=DEFAULT;
DROP TABLE t1,t2; 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 End of 5.0 tests

8
mysql-test/t/type_date.test
View File

@ -210,4 +210,12 @@ INSERT INTO t1 VALUES ('1000-00-00');
SET SQL_MODE=DEFAULT; SET SQL_MODE=DEFAULT;
DROP TABLE t1,t2; 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 --echo End of 5.0 tests

7
sql/field.cc
View File

@ -5195,6 +5195,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) int Field_date::cmp(const char *a_ptr, const char *b_ptr)
{ {
int32 a,b; int32 a,b;

1
sql/field.h
View File

@ -944,6 +944,7 @@ public:
double val_real(void); double val_real(void);
longlong val_int(void); longlong val_int(void);
String *val_str(String*,String *); String *val_str(String*,String *);
bool get_time(MYSQL_TIME *ltime);
bool send_binary(Protocol *protocol); bool send_binary(Protocol *protocol);
int cmp(const char *,const char*); int cmp(const char *,const char*);
void sort_string(char *buff,uint length); void sort_string(char *buff,uint length);