From 17fe2512016311e03d65a3003259b7952040ef4d Mon Sep 17 00:00:00 2001
From: "gunnar@mysql.com." <>
Date: Thu, 2 Feb 2006 21:27:23 +0100
Subject: [PATCH] item_timefunc.cc:   manual adding the fix for bug#15828 which
 did not automerge

---
 sql/item_timefunc.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 61449d3c671..17f25b49bcc 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -3023,9 +3023,9 @@ void Item_func_str_to_date::fix_length_and_dec()
   cached_field_type= MYSQL_TYPE_STRING;
   max_length= MAX_DATETIME_FULL_WIDTH*MY_CHARSET_BIN_MB_MAXLEN;
   cached_timestamp_type= MYSQL_TIMESTAMP_NONE;
-  if ((const_item= args[1]->const_item()))
+  format= args[1]->val_str(&format_str);
+  if (!args[1]->null_value && (const_item= args[1]->const_item()))
   {
-    format= args[1]->val_str(&format_str);
     cached_format_type= get_date_time_result_type(format->ptr(),
                                                   format->length());
     switch (cached_format_type) {