bk commit into 5.0 tree (jimw:1.1988)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1988 05/08/17 18:42:07 jimw@stripped +1 -0
  Fix bad merge of sql/item_strfunc.cc by aivanov

  sql/item_strfunc.cc
    1.248 05/08/17 18:27:13 jimw@stripped +0 -3
    Fix bad merge

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean

--- 1.247/sql/item_strfunc.cc	2005-08-15 13:03:36 -07:00
+++ 1.248/sql/item_strfunc.cc	2005-08-17 18:27:13 -07:00
@@ -2176,9 +2176,6 @@
   {
     ulonglong length= ((ulonglong) args[1]->val_int() *
                        collation.collation->mbmaxlen);
-    /*a comment before (merged) */
-    length= max((ulonglong)args[0]->max_length, length);
-    /*a comment after */
     if (length >= MAX_BLOB_WIDTH)
     {
       length= MAX_BLOB_WIDTH;