mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge linux-st28.site:/home/martin/mysql/src/bug30942/my50-bug30942

Browse source 
into  linux-st28.site:/home/martin/mysql/src/bug30942/my51-bug30942


sql/item_timefunc.h:
  Auto merged
mysql-test/r/type_date.result:
  Bug#30942: Manual merge
mysql-test/t/type_date.test:
  Bug#30942: Manual merge
This commit is contained in:
unknown 2007-10-04 10:06:33 +02:00
commit f7bf6318f5
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

@ -145,3 +145,13 @@ d dt ts
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
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

@ -139,3 +139,16 @@ insert into t1 values (9912101,9912101,9912101);
insert into t1 values (11111,11111,11111);
select * from 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;