summaryrefslogtreecommitdiff
path: root/mysql-test/t/func_time.test
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2006-10-17 16:22:44 -0400
committerunknown <cmiller@zippy.cornsilk.net>2006-10-17 16:22:44 -0400
commit9d5ecfc6eb7d05a4b1fcb7b2401d5410cd011e0d (patch)
tree572f87487c2a75c1e84ef41317ca4ebde78170ae /mysql-test/t/func_time.test
parent9ec2b951d5778ad9140089b540559b533ff50a80 (diff)
downloadmariadb-git-9d5ecfc6eb7d05a4b1fcb7b2401d5410cd011e0d.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/t/func_time.test')
-rw-r--r--mysql-test/t/func_time.test18
1 files changed, 0 insertions, 18 deletions
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test
index 6e0a313e834..d331c363926 100644
--- a/mysql-test/t/func_time.test
+++ b/mysql-test/t/func_time.test
@@ -525,24 +525,6 @@ union
union
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H);
-#
-# 21913: DATE_FORMAT() Crashes mysql server if I use it through
-# mysql-connector-j driver.
-#
-
-SET NAMES latin1;
-SET character_set_results = NULL;
-SHOW VARIABLES LIKE '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;
-
-DROP TABLE testBug8868;
-
-SET NAMES DEFAULT;
-
--echo End of 4.1 tests
explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,