Merge 5.3->5.5

7d3a67a9 · Alexander Barkov · 284479c0 · 30b007a1 · 7d3a67a9
Commit 7d3a67a9 authored Jun 05, 2014 by Alexander Barkov
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

sql/sql_time.cc sql/sql_time.cc +9 -2

No files found.
--- a/sql/sql_time.cc
+++ b/sql/sql_time.cc
@@ -372,9 +372,16 @@ 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);
+    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)
  {