bk commit into 4.1 tree (sergefp:1.2148) BUG#9401

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
4.1 repository of psergey. When psergey 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.2148 05/03/28 13:34:00 sergefp@stripped +2 -0
  Fix for BUG#9401: 
  * Add Item_field::set_result_field()
  * In create_tmp_field_from_field() call item->set_result_field(), 
    as the passed item may be not Item_field.
  overall the concept of 'result_field' still remains not very clear.

  sql/sql_select.cc
    1.390 05/03/28 13:33:57 sergefp@stripped +1 -1
    Fix for BUG#9401: 
    In create_tmp_field_from_field() call item->set_result_field(), as the passed item
    may be not Item_field.

  sql/item.h
    1.175 05/03/28 13:33:57 sergefp@stripped +2 -0
    Fx for BUG#9401: add Item_field::set_result_field()

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-4.1-bug9401

--- 1.174/sql/item.h	2005-03-17 04:49:58 +03:00
+++ 1.175/sql/item.h	2005-03-28 13:33:57 +04:00
@@ -381,6 +381,8 @@
   void set_field(Field *field);
 public:
   Field *field,*result_field;
+  
+  void set_result_field(Field *field) { result_field= field; }
 
   Item_field(const char *db_par,const char *table_name_par,
 	     const char *field_name_par)

--- 1.389/sql/sql_select.cc	2005-03-22 03:36:14 +03:00
+++ 1.390/sql/sql_select.cc	2005-03-28 13:33:57 +04:00
@@ -4637,7 +4637,7 @@
   if (new_field)
   {
     if (modify_item)
-      ((Item_field *)item)->result_field= new_field;
+      item->set_result_field(new_field);
     else
       new_field->field_name= item->name;
     if (org_field->maybe_null())