Merge 5.3->5.5

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/table.h b/sql/table.h
index cfdc0ffd077..7a946d63bcc 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -2129,6 +2129,16 @@ struct TABLE_LIST
 
   bool single_table_updatable();
 
+  bool is_inner_table_of_outer_join()
+  {
+    for (TABLE_LIST *tbl= this; tbl; tbl= tbl->embedding)
+    {
+      if (tbl->outer_join)
+        return true;
+    }
+    return false;
+  } 
+
 private:
   bool prep_check_option(THD *thd, uint8 check_opt_type);
   bool prep_where(THD *thd, Item **conds, bool no_where_clause);