bk commit into 5.0 tree (bar:1.1848)

[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.1848 05/03/28 14:15:43 bar@stripped +1 -0
  item_func.cc:
    Post merge additional fix for DECIMAL type:
    Bugs: #9425: A user variable doesn't always have implicit coercibility

  sql/item_func.cc
    1.180 05/03/28 14:15:07 bar@stripped +2 -2
    Post merge additional fix for DECIMAL type:
    Bugs: #9425: A user variable doesn't always have implicit coercibility

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

--- 1.179/sql/item_func.cc	Mon Mar 28 14:08:20 2005
+++ 1.180/sql/item_func.cc	Mon Mar 28 14:15:07 2005
@@ -3594,11 +3594,11 @@
   {
     if (!save_result.vdec)					// Null value
       res= update_hash((void*) 0, 0, DECIMAL_RESULT, &my_charset_bin,
-                       DERIVATION_NONE);
+                       DERIVATION_IMPLICIT);
     else
       res= update_hash((void*) save_result.vdec,
                        sizeof(my_decimal), DECIMAL_RESULT,
-                       &my_charset_bin, DERIVATION_NONE);
+                       &my_charset_bin, DERIVATION_IMPLICIT);
     break;
   }
   case ROW_RESULT: