diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-10-17 16:22:44 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-10-17 16:22:44 -0400 |
| commit | dfa183b7a7c0cf323d44700fac57c19e5fc17f44 (patch) | |
| tree | 572f87487c2a75c1e84ef41317ca4ebde78170ae /mysql-test/r/func_time.result | |
| parent | 98fd299133dd6b7324ce39e30ba69291473e6630 (diff) | |
| download | mariadb-git-dfa183b7a7c0cf323d44700fac57c19e5fc17f44.tar.gz | |
Merge fixes.
mysql-test/r/func_time.result:
One update from errmsg.txt and removal of /two/ duplicate results.
mysql-test/t/func_time.test:
Removed duplicate test.
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index e5b4b6bd5e6..037b1ca9df7 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -892,18 +892,6 @@ t1 CREATE TABLE `t1` ( `from_unixtime(1) + 0` double(23,6) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; -SET NAMES latin1; -SET character_set_results = NULL; -SHOW VARIABLES LIKE 'character_set_results'; -Variable_name Value -character_set_results -CREATE TABLE testBug8868 (field1 DATE, field2 VARCHAR(32) CHARACTER SET BINARY); -INSERT INTO testBug8868 VALUES ('2006-09-04', 'abcd'); -SELECT DATE_FORMAT(field1,'%b-%e %l:%i%p') as fmtddate, field2 FROM testBug8868; -fmtddate field2 -Sep-4 12:00AM abcd -DROP TABLE testBug8868; -SET NAMES DEFAULT; SELECT SEC_TO_TIME(3300000); SEC_TO_TIME(3300000) 838:59:59 @@ -981,7 +969,7 @@ CREATE TABLE t1(f1 TIME); INSERT INTO t1 VALUES('916:00:00 a'); Warnings: Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1264 Out of range value adjusted for column 'f1' at row 1 +Warning 1264 Out of range value for column 'f1' at row 1 SELECT * FROM t1; f1 838:59:59 @@ -1023,18 +1011,6 @@ union (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H); H 5 -SET NAMES latin1; -SET character_set_results = NULL; -SHOW VARIABLES LIKE 'character_set_results'; -Variable_name Value -character_set_results -CREATE TABLE testBug8868 (field1 DATE, field2 VARCHAR(32) CHARACTER SET BINARY); -INSERT INTO testBug8868 VALUES ('2006-09-04', 'abcd'); -SELECT DATE_FORMAT(field1,'%b-%e %l:%i%p') as fmtddate, field2 FROM testBug8868; -fmtddate field2 -Sep-4 12:00AM abcd -DROP TABLE testBug8868; -SET NAMES DEFAULT; End of 4.1 tests 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; |