database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql

Browse Source 
sql/field.cc:
  Auto merged
This commit is contained in:
unknown
2001-01-15 22:57:08 +02:00
parent c753f496a6 a4003125c0
commit c51686c39b
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_time.result
View File

@@ -184,3 +184,5 @@ extract(MINUTE_SECOND FROM "10:11:12")
1112 1112
extract(SECOND FROM "1999-01-02 10:11:12") extract(SECOND FROM "1999-01-02 10:11:12")
12 12
ctime hour(ctime)
2001-01-12 12:23:40 12

7
mysql-test/t/func_time.test
View File

@@ -98,3 +98,10 @@ select extract(HOUR_SECOND FROM "10:11:12");
select extract(MINUTE FROM "10:11:12"); select extract(MINUTE FROM "10:11:12");
select extract(MINUTE_SECOND FROM "10:11:12"); select extract(MINUTE_SECOND FROM "10:11:12");
select extract(SECOND FROM "1999-01-02 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;

2
sql/field.cc
View File

@@ -328,7 +328,7 @@ bool Field::get_time(TIME *ltime)
char buff[40]; char buff[40];
String tmp(buff,sizeof(buff)),tmp2,*res; String tmp(buff,sizeof(buff)),tmp2,*res;
if (!(res=val_str(&tmp,&tmp2)) || if (!(res=val_str(&tmp,&tmp2)) ||
str_to_time(res->ptr(),res->length(),ltime) == TIMESTAMP_NONE) str_to_time(res->ptr(),res->length(),ltime))
return 1; return 1;
return 0; return 0;
} }