From 421eededd316ef07b14f06a9bfd36e1f19b35d5b Mon Sep 17 00:00:00 2001
From: "gvb@phoenix.(none)" <>
Date: Sat, 14 Jan 2006 09:53:12 +0100
Subject: item_timefunc.cc:   fix for bug#15828 after review

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

(limited to 'sql/item_timefunc.cc')

diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index d060612c9f6..be8c5d2ad15 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -2750,7 +2750,8 @@ 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()) && !args[1]->null_value)
+  if (!args[1]->null_value && (const_item= args[1]->const_item()))
+  //if ((const_item= args[1]->const_item()) && !args[1]->null_value)
   {
     format= args[1]->val_str(&format_str);
     cached_format_type= get_date_time_result_type(format->ptr(),
-- 
cgit v1.2.1