database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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
sql/field.cc
View File

@ -328,7 +328,7 @@ bool Field::get_time(TIME *ltime)
char buff[40];
String tmp(buff,sizeof(buff)),tmp2,*res;
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 0;
}