bk commit into 4.1 tree (tsmith:1.2540)

[tim]

Below is the list of changes that have just been committed into a local
4.1 repository of tim. When tim 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-08-23 18:06:07-06:00, tsmith@stripped +2 -0
  Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41
  into  siva.hindu.god:/usr/home/tim/m/bk/41
  MERGE: 1.2510.46.3

  sql/item_func.h@stripped, 2006-08-23 18:06:04-06:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.129.1.1

  sql/item_strfunc.cc@stripped, 2006-08-23 18:06:04-06:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.246.2.2

# 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:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/41/RESYNC

--- 1.130/sql/item_func.h	2006-08-23 18:06:11 -06:00
+++ 1.131/sql/item_func.h	2006-08-23 18:06:11 -06:00
@@ -159,8 +159,7 @@ public:
     return agg_item_collations_for_comparison(c, func_name(),
                                               items, nitems, flags);
   }
-  bool agg_arg_charsets(DTCollation &c, Item **items, uint nitems,
-                        uint flags= 0)
+  bool agg_arg_charsets(DTCollation &c, Item **items, uint nitems, uint flags)
   {
     return agg_item_charsets(c, func_name(), items, nitems, flags);
   }

--- 1.249/sql/item_strfunc.cc	2006-08-23 18:06:11 -06:00
+++ 1.250/sql/item_strfunc.cc	2006-08-23 18:06:11 -06:00
@@ -2641,8 +2641,8 @@ void Item_func_export_set::fix_length_an
   uint sep_length=(arg_count > 3 ? args[3]->max_length : 1);
   max_length=length*64+sep_length*63;
 
-  if (agg_arg_charsets(collation, args+1, min(4,arg_count)-1),
-                       MY_COLL_ALLOW_CONV)
+  if (agg_arg_charsets(collation, args+1, min(4,arg_count)-1,
+                       MY_COLL_ALLOW_CONV))
     return;
 }