WL#2486 - natural and using join according to SQL:2003

- Corrected problem with N-way nested natural joins in PS mode.
- Code cleanup
- More asserts to check consistency of name resolution contexts
- Fixed potential memory leak of name resolution contexts


mysql-test/r/join.result:
  - Corrected problem with N-way nested natural joins in PS mode.
mysql-test/t/join.test:
  - Corrected problem with N-way nested natural joins in PS mode.
sql/item.h:
  - Fixed potential memory leak.
sql/sql_base.cc:
  - the local context of Item_fields that participate in TABLE_LIST::on_cond for
    natural joins is correctly set to the tables where the corresponding fields
    originate from.
  - removed unused variables
  - correct allocation of contexts
sql/sql_parse.cc:
  - correct allocation of contexts for JOIN ON conditions.
sql/table.cc:
  - added asserts to check the consistency of name resolution contexts
sql/table.h:
  - added asserts to check the consistency of name resolution contexts

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/table.h b/sql/table.h
index 3d4f02e389b..c0e4ad4c150 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -698,7 +698,7 @@ public:
   Field_iterator_natural_join() :column_ref_it(NULL), cur_column_ref(NULL) {}
   ~Field_iterator_natural_join() { delete column_ref_it; }
   void set(TABLE_LIST *table);
-  void next() { cur_column_ref= (*column_ref_it)++; }
+  void next();
   bool end_of_fields() { return !cur_column_ref; }
   const char *name() { return cur_column_ref->name(); }
   Item *create_item(THD *thd) { return cur_column_ref->create_item(thd); }