diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-15 22:57:08 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-15 22:57:08 +0200 |
| commit | c51686c39b93c5ee8cd6ba1e991880a15d294ea8 (patch) | |
| tree | 901e8cb5ce6cf2dd3025de42eb684fbb8c4573e8 /sql/field.cc | |
| parent | c753f496a6fa930b8307d1f4463c27532d9c6bb2 (diff) | |
| parent | a4003125c0e8798a55457abdd6db426db2dc7198 (diff) | |
| download | mariadb-git-c51686c39b93c5ee8cd6ba1e991880a15d294ea8.tar.gz | |
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
sql/field.cc:
Auto merged
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; } |