From: Date: January 22 2007 9:04pm
Subject: bk commit into 5.0 tree (evgen:1.2391) BUG#23417
List-Archive: http://lists.mysql.com/commits/18579
X-Bug: 23417
Message-Id: <20070122200416.EEEF622D1D1@moonbone.moonbone.local>

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@stripped, 2007-01-22 23:04:14+03:00, evgen@stripped +1 -0
  sql_select.cc:
    Code cleanup after fix for bug#23417.

  sql/sql_select.cc@stripped, 2007-01-22 23:04:03+03:00, evgen@stripped +2 -3
    Code cleanup after fix for bug#23417.

# 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:	moonbone.local
# Root:	/mnt/gentoo64/work/25123-bug-5.0-opt-mysql

--- 1.481/sql/sql_select.cc	2007-01-19 18:33:29 +03:00
+++ 1.482/sql/sql_select.cc	2007-01-22 23:04:03 +03:00
@@ -8766,8 +8766,7 @@
 
   if (type != Item::FIELD_ITEM &&
       item->real_item()->type() == Item::FIELD_ITEM &&
-      (item->type() != Item::REF_ITEM ||
-       !((Item_ref *) item)->depended_from))
+      !((Item_ref *) item)->depended_from)
   {
     orig_item= item;
     item= item->real_item();
@@ -13423,7 +13422,7 @@
     Item::Type type=field->type();
     Item::Type real_type= field->real_item()->type();
     if (type == Item::FIELD_ITEM || (real_type == Item::FIELD_ITEM &&
-        (type != Item::REF_ITEM || !((Item_ref *) field)->depended_from)))
+        !((Item_ref *) field)->depended_from))
       param->field_count++;
     else if (real_type == Item::SUM_FUNC_ITEM)
     {