summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2001-01-15 22:57:08 +0200
committermonty@donna.mysql.com <>2001-01-15 22:57:08 +0200
commitfbb40da0aa3cc1ee8eff8d405f070d6127cc269d (patch)
tree901e8cb5ce6cf2dd3025de42eb684fbb8c4573e8 /mysql-test
parent12d0f179cdeb6747683dfd5d4c8c27d32885c199 (diff)
parentbf0557cc7389a190754a9724e69e8184d3938cf0 (diff)
downloadmariadb-git-fbb40da0aa3cc1ee8eff8d405f070d6127cc269d.tar.gz
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/func_time.result2
-rw-r--r--mysql-test/t/func_time.test7
2 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index c132c7dba8e..79a03bdbd48 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -184,3 +184,5 @@ extract(MINUTE_SECOND FROM "10:11:12")
1112
extract(SECOND FROM "1999-01-02 10:11:12")
12
+ctime hour(ctime)
+2001-01-12 12:23:40 12
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test
index 33c62e5a6bf..d6427d121ec 100644
--- a/mysql-test/t/func_time.test
+++ b/mysql-test/t/func_time.test
@@ -98,3 +98,10 @@ select extract(HOUR_SECOND FROM "10:11:12");
select extract(MINUTE FROM "10:11:12");
select extract(MINUTE_SECOND FROM "10:11:12");
select extract(SECOND FROM "1999-01-02 10:11:12");
+
+drop table if exists t1;
+create table t1 (ctime varchar(20));
+insert into t1 values ('2001-01-12 12:23:40');
+select ctime, hour(ctime) from t1;
+drop table t1;
+