summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_time.result
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2006-06-19 13:03:29 +0500
committerunknown <ramil@mysql.com>2006-06-19 13:03:29 +0500
commit95939476ab600f2e19ac6780fc985b0500b60b9c (patch)
tree140c8f417704ab4324d7e00a69cb81c99402427b /mysql-test/r/func_time.result
parent0d165134cc8cea8322e89443f0a0aea2dedb6ca9 (diff)
downloadmariadb-git-95939476ab600f2e19ac6780fc985b0500b60b9c.tar.gz
Fix for bug #20496: func_time.test failure
mysql-test/r/func_time.result: Fix for bug #20496: func_time.test failure - floating point calculations removed. mysql-test/t/func_time.test: Fix for bug #20496: func_time.test failure - floating point calculations removed.
Diffstat (limited to 'mysql-test/r/func_time.result')
-rw-r--r--mysql-test/r/func_time.result13
1 files changed, 10 insertions, 3 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index e7a00b71961..c90a4258036 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -671,7 +671,14 @@ select f1 from t1 where makedate(2006,2) between date(f1) and date(f3);
f1
2006-01-02
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;
-now() - now() + 0 curtime() - curtime() + 0 sec_to_time(1) + 0 from_unixtime(1) + 0
-0.000000 0.000000 1.000000 19700101030001.000000
+show create table t1;
+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;