merge

sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/table.h:
  Auto merged

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 436d9412063..d7a88ecd53e 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -122,6 +122,16 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit,
       res= -1;
       goto exit;
     }
+
+    /* 
+       This is done in order to redo all field optimisations when any of the 
+       involved tables is used in the outer query 
+    */
+    if (tables)
+    {
+      for (TABLE_LIST *cursor= tables;  cursor;  cursor= cursor->next)
+	cursor->table->clear_query_id= 1;
+    }
 	
     item_list= select_cursor->item_list;
     select_cursor->with_wild= 0;