bk commit into 4.1 tree (elliot:1.2382)

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
4.1 repository of emurphy. When emurphy 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.2382 05/08/17 04:32:29 elliot@stripped +1 -0
  Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
  into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338

  sql/item.h
    1.190 05/08/17 04:32:25 elliot@stripped +0 -0
    Auto merged

# 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:	elliot
# Host:	agony.local
# Root:	/Users/emurphy/src/work/mysql-4.1-bug11338/RESYNC

--- 1.189/sql/item.h	2005-08-13 00:45:07 -04:00
+++ 1.190/sql/item.h	2005-08-17 04:32:25 -04:00
@@ -591,7 +591,7 @@
   */
   void (*set_param_func)(Item_param *param, uchar **pos, ulong len);
 
-  const String *query_val_str(String *str) const;
+  const String *query_val_str(String *str, THD *thd) const;
 
   bool convert_str_value(THD *thd);