Merge bk@192.168.21.1:mysql-5.0-opt

into  mysql.com:/home/hf/work/mysql-5.0-0mrg

1 files changed, 17 insertions, 0 deletions

diff --git a/sql/table.cc b/sql/table.cc
index d72379efb32..5d5d5095e7c 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -3032,6 +3032,23 @@ void st_table_list::reinit_before_use(THD *thd)
          embedding->nested_join->join_list.head() == embedded);
 }
 
+/*
+  Return subselect that contains the FROM list this table is taken from
+
+  SYNOPSIS
+    st_table_list::containing_subselect()
+ 
+  RETURN
+    Subselect item for the subquery that contains the FROM list
+    this table is taken from if there is any
+    0 - otherwise
+
+*/
+
+Item_subselect *st_table_list::containing_subselect()
+{    
+  return (select_lex ? select_lex->master_unit()->item : 0);
+}
 
 /*****************************************************************************
 ** Instansiate templates