bk commit into 5.0 tree (evgen:1.2122) BUG#15560

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen 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.2122 06/03/30 19:04:21 evgen@stripped +3 -0
  item_sum.cc, sql_select.cc:
    After merge fix for bug#15560
  item_sum.h:
     After merge fix for bug#15560

  sql/item_sum.cc
    1.173 06/03/30 19:03:39 evgen@stripped +3 -3
    After merge fix for bug#15560

  sql/item_sum.h
    1.100 06/03/30 19:03:25 evgen@stripped +2 -2
     After merge fix for bug#15560

  sql/sql_select.cc
    1.401 06/03/30 19:02:57 evgen@stripped +3 -2
    After merge fix for bug#15560

# 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:	evgen
# Host:	sunlight.local
# Root:	/local_work/15560-bug-5.0-mysql

--- 1.172/sql/item_sum.cc	2006-03-30 17:14:51 +04:00
+++ 1.173/sql/item_sum.cc	2006-03-30 19:03:39 +04:00
@@ -3024,14 +3024,14 @@ Item_func_group_concat(Name_resolution_c
                        bool distinct_arg, List<Item> *select_list,
                        SQL_LIST *order_list, String *separator_arg)
   :tmp_table_param(0), warning(0),
-   force_copy_fields(0), separator(separator_arg), tree(0), table(0),
+   separator(separator_arg), tree(0), table(0),
    order(0), context(context_arg),
    arg_count_order(order_list ? order_list->elements : 0),
    arg_count_field(select_list->elements),
    count_cut_values(0),
    distinct(distinct_arg),
    warning_for_row(FALSE),
-   original(0)
+   force_copy_fields(0), original(0)
 {
   Item *item_select;
   Item **arg_ptr;
@@ -3077,7 +3077,6 @@ Item_func_group_concat::Item_func_group_
   :Item_sum(thd, item),
   tmp_table_param(item->tmp_table_param),
   warning(item->warning),
-  force_copy_fields(item->force_copy_fields),
   separator(item->separator),
   tree(item->tree),
   table(item->table),
@@ -3089,6 +3088,7 @@ Item_func_group_concat::Item_func_group_
   distinct(item->distinct),
   warning_for_row(item->warning_for_row),
   always_null(item->always_null),
+  force_copy_fields(item->force_copy_fields),
   original(item)
 {
   quick_group= item->quick_group;

--- 1.99/sql/item_sum.h	2006-03-30 17:14:51 +04:00
+++ 1.100/sql/item_sum.h	2006-03-30 19:03:25 +04:00
@@ -525,13 +525,13 @@ class Item_sum_count_distinct :public It
 public:
   Item_sum_count_distinct(List<Item> &list)
     :Item_sum_int(list), table(0), field_lengths(0), tmp_table_param(0),
-     tree(0), force_copy_fields(0), original(0), always_null(FALSE)
+     force_copy_fields(0), tree(0), original(0), always_null(FALSE)
   { quick_group= 0; }
   Item_sum_count_distinct(THD *thd, Item_sum_count_distinct *item)
     :Item_sum_int(thd, item), table(item->table),
      field_lengths(item->field_lengths),
      tmp_table_param(item->tmp_table_param),
-     tree(item->tree), force_copy_fields(0), original(item),
+     force_copy_fields(0), tree(item->tree), original(item),
      tree_key_length(item->tree_key_length),
      always_null(item->always_null)
   {}

--- 1.400/sql/sql_select.cc	2006-03-30 17:14:51 +04:00
+++ 1.401/sql/sql_select.cc	2006-03-30 19:02:57 +04:00
@@ -8669,8 +8669,9 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA
         create_tmp_field_for_schema(thd, item, table) :
         create_tmp_field(thd, table, item, type, &copy_func,
                          tmp_from_field, group != 0,
-                         not_all_columns || group != 0,
-                         item->marker == 4, 0,
+                         !force_copy_fields &&
+                           (not_all_columns || group !=0),
+                         item->marker == 4, force_copy_fields,
                          param->convert_blob_length);
 
       if (!new_field)