diff options
| author | monty@donna.mysql.com <> | 2001-01-15 22:57:08 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-01-15 22:57:08 +0200 |
| commit | fbb40da0aa3cc1ee8eff8d405f070d6127cc269d (patch) | |
| tree | 901e8cb5ce6cf2dd3025de42eb684fbb8c4573e8 /sql/field.cc | |
| parent | 12d0f179cdeb6747683dfd5d4c8c27d32885c199 (diff) | |
| parent | bf0557cc7389a190754a9724e69e8184d3938cf0 (diff) | |
| download | mariadb-git-fbb40da0aa3cc1ee8eff8d405f070d6127cc269d.tar.gz | |
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 34b047e6a1c..67f93532e99 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -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; } |