From 35ca5a4f87816ea3bb43120b568fd53078dcf80e Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Sun, 29 Apr 2007 18:46:06 +0500
Subject: merging fix

---
 sql/time.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sql/time.cc')

diff --git a/sql/time.cc b/sql/time.cc
index 249de3b879b..c552d085f5e 100644
--- a/sql/time.cc
+++ b/sql/time.cc
@@ -860,8 +860,9 @@ bool date_add_interval(MYSQL_TIME *ltime, interval_type int_type, INTERVAL inter
     }
     break;
   default:
-    return 1;
+    goto null_date;
   }
+
   return 0;					// Ok
 
 invalid_date:
@@ -869,6 +870,7 @@ invalid_date:
                       ER_DATETIME_FUNCTION_OVERFLOW,
                       ER(ER_DATETIME_FUNCTION_OVERFLOW),
                       "datetime");
+null_date:
   return 1;
 }
 
-- 
cgit v1.2.1