bk commit into 4.1 tree (igor:1.2373) 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.2373 05/08/02 13:12:41 igor@stripped +1 -0
  item_sum.cc:
    Reversed the changes to fix bug #12095 after review
    done by SergeyG. Applied a fix suggested by him.
    Added my comment.

  sql/item_sum.cc
    1.142 05/08/02 13:11:19 igor@stripped +10 -3
    Reversed the changes to fix bug #12095 after review
    done by SergeyG. Applied a fix suggested by him.
    Added my comment.

# 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.141/sql/item_sum.cc	Sun Jul 31 02:28:58 2005
+++ 1.142/sql/item_sum.cc	Tue Aug  2 13:11:19 2005
@@ -1577,7 +1577,11 @@
       the temporary table, not the original field
     */
     Field *field= (*field_item)->get_tmp_table_field();
-    if (field)
+    /* 
+      If field_item is a const item then either get_tp_table_field returns 0
+      or it is an item over a const table. 
+    */
+    if (field && !(*field_item)->const_item())
     {
       int res;
       uint offset= field->offset();
@@ -1610,7 +1614,11 @@
       the temporary table, not the original field
     */
     Field *field= item->get_tmp_table_field();
-    if (field)
+    /* 
+      If item is a const item then either get_tp_table_field returns 0
+      or it is an item over a const table. 
+    */
+    if (field && !item->const_item())
     {
       int res;
       uint offset= field->offset();
@@ -1986,7 +1994,6 @@
   }
   
   count_field_types(tmp_table_param,all_fields,0);
-  tmp_table_param->need_const= 1;
   if (table)
   {
     /*