From 30b007a1ab5dd950fe451d78c29805f09cc0b98f Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.org>
Date: Thu, 5 Jun 2014 09:01:05 +0400
Subject: [PATCH] Fixing a valgrind warning introduced in the previous
 changeset: "have_warnings" was set to an uninialized value when converting a
 negative number to datetime.

---
 sql/time.cc | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/sql/time.cc b/sql/time.cc
index ab36db40bfe..2cb3befe5a2 100644
--- a/sql/time.cc
+++ b/sql/time.cc
@@ -303,8 +303,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)