MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:tim Date:August 9 2006 8:48am
Subject:bk commit into 4.1 tree (tsmith:1.2541) BUG#21531
View as plain text  
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-09 02:48:34-06:00, tsmith@stripped +2 -0
  Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets
  
  - Remove default value for 'flags' argument of agg_arg_charsets()
  - Move MY_COLL_ALLOW_CONV inside the agg_arg_charsets() function, not outside it,
    in Item_func_export_set::fix_length_and_dec()

  sql/item_func.h@stripped, 2006-08-09 02:48:30-06:00, tsmith@stripped +1 -2
    Remove default value for 'flags' argument of agg_arg_charsets()

  sql/item_strfunc.cc@stripped, 2006-08-09 02:48:30-06:00, tsmith@stripped +2 -2
    Fix typo in Item_func_export_set::fix_length_and_dec() which caused the
    function to require all arguments to have identical collations.

# 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

--- 1.129/sql/item_func.h	2006-08-09 02:48:42 -06:00
+++ 1.130/sql/item_func.h	2006-08-09 02:48:42 -06:00
@@ -156,8 +156,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.247/sql/item_strfunc.cc	2006-08-09 02:48:42 -06:00
+++ 1.248/sql/item_strfunc.cc	2006-08-09 02:48:42 -06:00
@@ -2635,8 +2635,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;
 }
 
Thread
bk commit into 4.1 tree (tsmith:1.2541) BUG#21531tim9 Aug