Merge 5.3->main -> 5.3-mwl90

1 files changed, 13 insertions, 0 deletions

diff --git a/sql/table.cc b/sql/table.cc
index 5548c220897..ca78b7baa87 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -5345,6 +5345,19 @@ bool st_table::is_children_attached(void)
          (parent && parent->children_attached));
 }
 
+
+/*
+  Return TRUE if the table is filled at execution phase 
+  
+  (and so, the optimizer must not do anything that depends on the contents of
+   the table, like range analysis or constant table detection)
+*/
+
+bool st_table::is_filled_at_execution()
+{ 
+  return test(pos_in_table_list->jtbm_subselect);
+}
+
 /*
   Cleanup this table for re-execution.