bk commit into 5.0 tree (kaa:1.2233)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 repository of kaa. When kaa 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@stripped, 2006-09-12 18:28:36+04:00, kaa@stripped +1 -0
  Fixed compilation

  sql/item_func.cc@stripped, 2006-09-12 18:28:33+04:00, kaa@stripped +5 -5
    Fixed compilation

# 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:	kaa
# Host:	polly.local
# Root:	/tmp/20924/bug20294/my50-bug20294

--- 1.294/sql/item_func.cc	2006-09-12 18:28:41 +04:00
+++ 1.295/sql/item_func.cc	2006-09-12 18:28:41 +04:00
@@ -3574,7 +3574,7 @@ update_hash(user_var_entry *entry, bool 
 
 bool
 Item_func_set_user_var::update_hash(void *ptr, uint length, Item_result type,
-                                    CHARSET_INFO *cs, Derivation dv
+                                    CHARSET_INFO *cs, Derivation dv,
                                     bool unsigned_arg)
 {
   /*
@@ -3816,11 +3816,11 @@ Item_func_set_user_var::update()
   {
     if (!save_result.vdec)					// Null value
       res= update_hash((void*) 0, 0, DECIMAL_RESULT, &my_charset_bin,
-                       DERIVATION_IMPLICIT);
+                       DERIVATION_IMPLICIT, 0);
     else
       res= update_hash((void*) save_result.vdec,
                        sizeof(my_decimal), DECIMAL_RESULT,
-                       &my_charset_bin, DERIVATION_IMPLICIT);
+                       &my_charset_bin, DERIVATION_IMPLICIT, 0);
     break;
   }
   case ROW_RESULT:
@@ -4176,7 +4176,7 @@ bool Item_user_var_as_out_param::fix_fie
 void Item_user_var_as_out_param::set_null_value(CHARSET_INFO* cs)
 {
   if (::update_hash(entry, TRUE, 0, 0, STRING_RESULT, cs,
-                    DERIVATION_IMPLICIT))
+                    DERIVATION_IMPLICIT, 0))
     current_thd->fatal_error();			// Probably end of memory
 }
 
@@ -4185,7 +4185,7 @@ void Item_user_var_as_out_param::set_val
                                            CHARSET_INFO* cs)
 {
   if (::update_hash(entry, FALSE, (void*)str, length, STRING_RESULT, cs,
-                    DERIVATION_IMPLICIT))
+                    DERIVATION_IMPLICIT, 0))
     current_thd->fatal_error();			// Probably end of memory
 }