bk commit into 5.0 tree (igor:1.1892) BUG#11412

[igor]

Below is the list of changes that have just been committed into a local
5.0 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.1892 05/07/26 08:20:42 igor@stripped +1 -0
  item.h:
    Post review change in Item_ref::get_tmp_table_field (bug #11412).

  sql/item.h
    1.157 05/07/26 08:20:04 igor@stripped +4 -1
    Post review change in Item_ref::get_tmp_table_field (bug #11412).

# 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-5.0-0

--- 1.156/sql/item.h	Mon Jul 25 12:41:50 2005
+++ 1.157/sql/item.h	Tue Jul 26 08:20:04 2005
@@ -1467,7 +1467,10 @@
   Field *get_tmp_table_field()
   { return result_field ? result_field : (*ref)->get_tmp_table_field(); }
   Item *get_tmp_table_item(THD *thd)
-  { return (*ref)->get_tmp_table_item(thd); }
+  { 
+    return (result_field ? new Item_field(result_field) :
+                          (*ref)->get_tmp_table_item(thd));
+  }
   table_map used_tables() const		
   { 
     return depended_from ? OUTER_REF_TABLE_BIT : (*ref)->used_tables();