bk commit into 4.1 tree (igor:1.2372) BUG#12095

[igor]

Below is the list of changes that have just been committed into a local
4.1 repository of igor. When igor 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.2372 05/08/02 11:58:52 igor@stripped +2 -0
  sql_select.cc, sql_class.h:
    Reversed the changes to fix bug #12095 after review
    done by SergeyG. Applied a fix suggested by him.

  sql/sql_select.cc
    1.426 05/08/02 11:58:21 igor@stripped +1 -2
    Reversed the changes to fix bug #12095 after review
    done by SergeyG. Applied a fix suggested by him.

  sql/sql_class.h
    1.281 05/08/02 11:57:54 igor@stripped +1 -3
    Reversed the changes to fix bug #12095 after review
    done by SergeyG. Applied a fix suggested by him.

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-4.1-0

--- 1.280/sql/sql_class.h	Thu Jul 28 19:04:44 2005
+++ 1.281/sql/sql_class.h	Tue Aug  2 11:57:54 2005
@@ -1325,12 +1325,10 @@
   bool  using_indirect_summary_function;
   /* If >0 convert all blob fields to varchar(convert_blob_length) */
   uint  convert_blob_length; 
-  bool need_const; /* <=> const items are saved in tmp table */
 
   TMP_TABLE_PARAM()
     :copy_field(0), group_parts(0),
-    group_length(0), group_null_parts(0), convert_blob_length(0),
-    need_const(0) 
+    group_length(0), group_null_parts(0), convert_blob_length(0)
   {}
   ~TMP_TABLE_PARAM()
   {

--- 1.425/sql/sql_select.cc	Thu Jul 28 18:16:46 2005
+++ 1.426/sql/sql_select.cc	Tue Aug  2 11:58:21 2005
@@ -5201,8 +5201,7 @@
 	param->using_indirect_summary_function=1;
 	continue;
       }
-      if (item->const_item() && (int) hidden_field_count <= 0 &&
-          !param->need_const)
+      if (item->const_item() && (int) hidden_field_count <= 0)
         continue; // We don't have to store this
     }
     if (type == Item::SUM_FUNC_ITEM && !group && !save_sum_fields)