bk commit into 5.0 tree (ramil:1.2457)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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, 2007-05-24 14:43:27+05:00, ramil@stripped +1 -0
  after-review fix: a comment added.

  sql/sql_prepare.cc@stripped, 2007-05-24 14:43:25+05:00, ramil@stripped +5 -0
    a comment added.

# 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:	ramil
# Host:	ramil.myoffice.izhnet.ru
# Root:	/home/ram/work/b26842/b26842.5.0

--- 1.198/sql/sql_prepare.cc	2007-05-24 14:43:36 +05:00
+++ 1.199/sql/sql_prepare.cc	2007-05-24 14:43:36 +05:00
@@ -983,6 +983,11 @@ static bool insert_params_from_vars_with
 
     entry= (user_var_entry *) hash_search(&thd->user_vars, (byte*) varname->str,
                                           varname->length);
+    /*
+      We have to call the setup_one_conversion_function() here to set
+      the parameter's members that might be needed further
+      (e.g. value.cs_info.character_set_client is used in the query_val_str()).
+    */
     setup_one_conversion_function(thd, param, param->param_type);
     if (param->set_from_user_var(thd, entry))
       DBUG_RETURN(1);