Commit 49797c23 authored by ramil@mysql.com's avatar ramil@mysql.com

Fix for bug #20496: func_time.test failure

parent c02e6f2a
...@@ -671,7 +671,14 @@ select f1 from t1 where makedate(2006,2) between date(f1) and date(f3); ...@@ -671,7 +671,14 @@ select f1 from t1 where makedate(2006,2) between date(f1) and date(f3);
f1 f1
2006-01-02 2006-01-02
drop table t1; drop table t1;
select now() - now() + 0, curtime() - curtime() + 0, create table t1 select now() - now(), curtime() - curtime(),
sec_to_time(1) + 0, from_unixtime(1) + 0; sec_to_time(1) + 0, from_unixtime(1) + 0;
now() - now() + 0 curtime() - curtime() + 0 sec_to_time(1) + 0 from_unixtime(1) + 0 show create table t1;
0.000000 0.000000 1.000000 19700101030001.000000 Table Create Table
t1 CREATE TABLE `t1` (
`now() - now()` double(23,6) NOT NULL default '0.000000',
`curtime() - curtime()` double(23,6) NOT NULL default '0.000000',
`sec_to_time(1) + 0` double(23,6) default NULL,
`from_unixtime(1) + 0` double(23,6) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
...@@ -347,7 +347,9 @@ drop table t1; ...@@ -347,7 +347,9 @@ drop table t1;
# Bug #16546 # Bug #16546
# #
select now() - now() + 0, curtime() - curtime() + 0, create table t1 select now() - now(), curtime() - curtime(),
sec_to_time(1) + 0, from_unixtime(1) + 0; sec_to_time(1) + 0, from_unixtime(1) + 0;
show create table t1;
drop table t1;
# End of 4.1 tests # End of 4.1 tests
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment