diff options
| author | unknown <ramil@mysql.com> | 2006-06-21 09:16:22 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2006-06-21 09:16:22 +0500 |
| commit | c6b67f0d15dc00e8863733893471b00e98d541f0 (patch) | |
| tree | 14a245a51e70ab7d625b9d37964132111a2dcdd9 | |
| parent | 406a7ba99209dd65a6974f2689fc92541ccf4450 (diff) | |
| parent | 49042de5b2ef0ea6799941334385f4352d3e64ef (diff) | |
| download | mariadb-git-c6b67f0d15dc00e8863733893471b00e98d541f0.tar.gz | |
Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
mysql-test/r/func_time.result:
SCCS merged
| -rw-r--r-- | mysql-test/r/func_time.result | 13 | ||||
| -rw-r--r-- | mysql-test/t/func_time.test | 6 |
2 files changed, 14 insertions, 5 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 5b24480f2e9..593ce7b26c8 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -794,10 +794,17 @@ 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; explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1, timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2; id select_type table type possible_keys key key_len ref rows Extra diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 4032d5a0a5c..d817d016881 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -392,8 +392,10 @@ drop table t1; # Bug #16546 # -select now() - now() + 0, curtime() - curtime() + 0, - sec_to_time(1) + 0, from_unixtime(1) + 0; +create table t1 select now() - now(), curtime() - curtime(), + sec_to_time(1) + 0, from_unixtime(1) + 0; +show create table t1; +drop table t1; # End of 4.1 tests |