diff options
| -rw-r--r-- | sql/sql_time.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc index 66fd9f49cb6..c5c65391758 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -372,8 +372,15 @@ static bool number_to_time_with_warn(bool neg, ulonglong nr, ulong sec_part, else { f_type= MYSQL_TYPE_DATETIME; - res= neg ? -1 : number_to_datetime(nr, sec_part, ltime, fuzzydate, &was_cut); - have_warnings= was_cut && (fuzzydate & TIME_NO_ZERO_IN_DATE); + if (neg) + { + res= -1; + } + else + { + res= number_to_datetime(nr, sec_part, ltime, fuzzydate, &was_cut); + have_warnings= was_cut && (fuzzydate & TIME_NO_ZERO_IN_DATE); + } } if (res < 0 || have_warnings) |