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

Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt

Browse Source 
into  dl145s.mysql.com:/data0/mhansson/bug30942/my50-bug30942
This commit is contained in:
unknown
2007-10-04 11:06:01 +02:00
parent a408f34866 f8f021fd6b
commit ae2956f79a
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,3 +136,13 @@ d dt ts
0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00
2001-11-11 2001-11-11 00:00:00 2001-11-11 00:00:00 2001-11-11 2001-11-11 00:00:00 2001-11-11 00:00:00
drop table t1; drop table t1;
CREATE TABLE t1 (
a INT
);
INSERT INTO t1 VALUES (1);
INSERT INTO t1 VALUES (NULL);
SELECT str_to_date( '', a ) FROM t1;
str_to_date( '', a )
0000-00-00 00:00:00
NULL
DROP TABLE t1;

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

@@ -136,3 +136,16 @@ insert into t1 values (9912101,9912101,9912101);
insert into t1 values (11111,11111,11111); insert into t1 values (11111,11111,11111);
select * from t1; select * from t1;
drop table t1; drop table t1;
#
# Bug #30942: select str_to_date from derived table returns varying results
#
CREATE TABLE t1 (
a INT
);
INSERT INTO t1 VALUES (1);
INSERT INTO t1 VALUES (NULL);
SELECT str_to_date( '', a ) FROM t1;
DROP TABLE t1;

2
sql/item_timefunc.h
View File

@@ -1030,7 +1030,7 @@ class Item_func_str_to_date :public Item_str_func
bool const_item; bool const_item;
public: public:
Item_func_str_to_date(Item *a, Item *b) Item_func_str_to_date(Item *a, Item *b)
:Item_str_func(a, b) :Item_str_func(a, b), const_item(false)
{} {}
String *val_str(String *str); String *val_str(String *str);
bool get_date(MYSQL_TIME *ltime, uint fuzzy_date); bool get_date(MYSQL_TIME *ltime, uint fuzzy_date);