bk commit into 5.1 tree (gkodinov:1.2327)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge 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-11-10 12:43:44+02:00, gkodinov@stripped +2 -0
  fixed bad 5.0->5.1 merge 

  mysql-test/t/disabled.def@stripped, 2006-11-10 12:43:35+02:00, gkodinov@stripped +0 -1
    fixed bad 5.0->5.1 merge 

  sql/item.cc@stripped, 2006-11-10 12:43:36+02:00, gkodinov@stripped +1 -2
    fixed bad 5.0->5.1 merge 

# 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:	gkodinov
# Host:	macbook.gmz
# Root:	/Users/kgeorge/mysql/work/B22457-5.1-opt

--- 1.216/sql/item.cc	2006-11-08 16:54:25 +02:00
+++ 1.217/sql/item.cc	2006-11-10 12:43:36 +02:00
@@ -3741,8 +3741,7 @@ bool Item_field::fix_fields(THD *thd, It
         Item** res= find_item_in_list(this, thd->lex->current_select->item_list,
                                       &counter, REPORT_EXCEPT_NOT_FOUND,
                                       &not_used);
-        if (res != (Item **)not_found_item &&
-            (*res)->type() == Item::FIELD_ITEM)
+        if (res != (Item **)not_found_item)
         {
           if ((*res)->type() == Item::FIELD_ITEM)
           {

--- 1.207/mysql-test/t/disabled.def	2006-11-09 09:33:39 +02:00
+++ 1.208/mysql-test/t/disabled.def	2006-11-10 12:43:35 +02:00
@@ -44,4 +44,3 @@ rpl_multi_engine         : BUG#22583 200
 #rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson
 ndb_binlog_discover      : bug#21806 2006-08-24
 ndb_autodiscover3        : bug#21806
-order_by                 : GKodinov - please fix bug #22457 in 5.1 also