diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-08-28 12:55:59 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-08-28 12:55:59 +0200 |
| commit | 2c5e22787568ea35ae9c542f511a951bbb800f6b (patch) | |
| tree | 810fbe1527988b56b8833ff44e31f1a6f4ab4484 /sql-common | |
| parent | f56dc2083534e89695bc11a31df84c4c98caa4ef (diff) | |
| parent | 3b756a01a04cf8d7a2a11207d3512f5839b4fd89 (diff) | |
| download | mariadb-git-2c5e22787568ea35ae9c542f511a951bbb800f6b.tar.gz | |
Manual merge between bug#46362 and bug#20577.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 747c5797ed4..a1b85049934 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -450,9 +450,7 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, } } - DBUG_RETURN(l_time->time_type= - (number_of_fields <= 3 ? MYSQL_TIMESTAMP_DATE : - MYSQL_TIMESTAMP_DATETIME)); + DBUG_RETURN(l_time->time_type); err: bzero((char*) l_time, sizeof(*l_time)); |