diff options
| author | jimw@mysql.com <> | 2005-07-19 19:59:34 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-07-19 19:59:34 -0700 |
| commit | d7fbff3ec5656a2f2016da4f7dd4eba338a101be (patch) | |
| tree | 3a657be8688ef67ef02e0c687d61bb47bec6fe2f /libmysql | |
| parent | 39efcdcf7cfb8efa6777666cde3467b18b11479d (diff) | |
| parent | dd2f631ec45b955af458f8a3b1f9d7d7d0a4fa73 (diff) | |
| download | mariadb-git-d7fbff3ec5656a2f2016da4f7dd4eba338a101be.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-5906
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index f9ddf7fa665..024d19ff24b 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -3585,7 +3585,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, case MYSQL_TYPE_TIMESTAMP: { MYSQL_TIME *tm= (MYSQL_TIME *)buffer; - (void) str_to_datetime(value, length, tm, 0, &err); + (void) str_to_datetime(value, length, tm, TIME_FUZZY_DATE, &err); *param->error= test(err) && (param->buffer_type == MYSQL_TYPE_DATE && tm->time_type != MYSQL_TIMESTAMP_DATE); break; @@ -3703,7 +3703,8 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, case MYSQL_TYPE_DATETIME: { int error; - value= number_to_datetime(value, (MYSQL_TIME *) buffer, 1, &error); + value= number_to_datetime(value, (MYSQL_TIME *) buffer, TIME_FUZZY_DATE, + &error); *param->error= test(error); break; } |