bk commit into 5.0 tree (gunnar:1.2029) BUG#15828

[Gunnar von Boehn]

Below is the list of changes that have just been committed into a local
5.0 repository of gvb. When gvb does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2029 06/02/02 21:27:23 gunnar@stripped. +1 -0
  item_timefunc.cc:
    manual adding the fix for bug#15828 which did not automerge

  sql/item_timefunc.cc
    1.102 06/02/02 21:24:48 gunnar@stripped. +2 -2
    manual adding the fix for bug#15828 which did not automerge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gunnar
# Host:	titan.
# Root:	/data/BK/mysql-5.0_15828

--- 1.101/sql/item_timefunc.cc	2006-02-02 19:10:18 +01:00
+++ 1.102/sql/item_timefunc.cc	2006-02-02 21:24:48 +01:00
@@ -3023,9 +3023,9 @@
   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) {