Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-count-4.1


sql/item.cc:
  Auto merged

2 files changed, 10 insertions, 5 deletions

diff --git a/sql/item.cc b/sql/item.cc
index 1792e58bb79..ea1eaf29373 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -274,11 +274,13 @@ Item_field::Item_field(Field *f) :Item_ident(NullS,f->table_name,f->field_name)
 }
 
 // Constructor need to process subselect with temporary tables (see Item)
-Item_field::Item_field(THD *thd, Item_field &item):
-  Item_ident(thd, item),
-  field(item.field),
-  result_field(item.result_field)
-{ collation.set(DERIVATION_IMPLICIT); }
+Item_field::Item_field(THD *thd, Item_field &item)
+  :Item_ident(thd, item),
+   field(item.field),
+   result_field(item.result_field)
+{
+  collation.set(DERIVATION_IMPLICIT);
+}
 
 void Item_field::set_field(Field *field_par)
 {
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 89aae95c951..9bdb989b6a1 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -4866,6 +4866,9 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
       recinfo->type=FIELD_NORMAL;
     if (!--hidden_field_count)
       null_count=(null_count+7) & ~7;		// move to next byte
+
+    // fix table name in field entry
+    field->table_name= table->table_name;
   }
 
   param->copy_field_end=copy;