bk commit into 5.0 tree (bar:1.2162)

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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.2162 06/04/17 15:36:25 bar@stripped +1 -0
  item_timefunc.cc:
    5.0 additional fix for b#18691
    Handle DECIMAL the same with INT and REAL.

  sql/item_timefunc.cc
    1.107 06/04/17 15:35:11 bar@stripped +1 -0
    5.0 additional fix for b#18691
    Handle DECIMAL the same with INT and REAL.

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.0

--- 1.106/sql/item_timefunc.cc	2006-04-17 15:01:44 +05:00
+++ 1.107/sql/item_timefunc.cc	2006-04-17 15:35:11 +05:00
@@ -2457,6 +2457,7 @@ void Item_char_typecast::fix_length_and_
        the argument's charset.
   */
   from_cs= (args[0]->result_type() == INT_RESULT || 
+            args[0]->result_type() == DECIMAL_RESULT ||
             args[0]->result_type() == REAL_RESULT) ?
            (cast_cs->mbminlen == 1 ? cast_cs : &my_charset_latin1) :
            args[0]->collation.collation;