diff options
| author | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-09-04 09:28:39 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-09-04 09:28:39 +0200 |
| commit | 43eeeac033a99de40559c85d92d7e5db155dd70d (patch) | |
| tree | 7f64ae4b9008070d9a7341f2ee0f9318462290d2 /mysql-test/r/func_time.result | |
| parent | 49e2267ebda7809a1f93e61b4544ae800ed0705a (diff) | |
| parent | 52f3977eef283130b2d281a4f79353c04412cd92 (diff) | |
| download | mariadb-git-43eeeac033a99de40559c85d92d7e5db155dd70d.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into salvation.intern.azundris.com:/home/tnurnberg/21913/my41-21913
mysql-test/r/func_time.result:
manual merge
mysql-test/t/func_time.test:
manual merge
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 47a0f83802c..a5bd9674bf2 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -695,6 +695,18 @@ 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 time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H) union (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H); |