bk commit into 4.1 tree (bar:1.2472)

[bar]

Below is the list of changes that have just been committed into a local
4.1 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.2472 05/10/05 17:45:23 bar@stripped +1 -0
  item_cmpfunc.cc:
    sorry, another wrong variable

  sql/item_cmpfunc.cc
    1.202 05/10/05 17:45:04 bar@stripped +1 -1
    sorry, another wrong variable

# 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-4.1.b12476

--- 1.201/sql/item_cmpfunc.cc	2005-10-05 17:33:20 +05:00
+++ 1.202/sql/item_cmpfunc.cc	2005-10-05 17:45:04 +05:00
@@ -2460,7 +2460,7 @@
           code instead of Unicode code as "escape" argument.
           Convert to "cs" if charset of escape differs.
         */
-        CHARSET_INFO *cs= cmp_collation.collation;
+        CHARSET_INFO *cs= cmp.cmp_collation.collation;
         uint32 unused;
         if (escape_str->needs_conversion(escape_str->length(),
                                          escape_str->charset(), cs, &unused))