support of subselect without FROM reducing (SCRUM)

fixed bug of calling setup_fields without correct lex->current_select pointer in mysql_derived
more correct creation of reference in Item_field::fix_field

1 files changed, 2 insertions, 0 deletions

diff --git a/sql/item_row.h b/sql/item_row.h
index cf67567c3ed..f33e0cc9821 100644
--- a/sql/item_row.h
+++ b/sql/item_row.h
@@ -64,6 +64,8 @@ public:
   bool const_item() const { return const_item_cache; };
   enum Item_result result_type() const { return ROW_RESULT; }
   void update_used_tables();
+  bool check_loop(uint id);
+  void set_outer_resolving();
 
   uint cols() { return arg_count; }
   Item* el(uint i) { return items[i]; }