fixed detection of updating table on which we select (BUG#6032)

mysql-test/r/view.result:
  Trys update table from which we select using views and subqueries
mysql-test/t/view.test:
  Trys update table from which we select using views and subqueries
sql/sql_acl.cc:
  fix of fix for bug BUG#5976
sql/sql_base.cc:
  protection against temporary tables which have not table->table->table_cache_key
  fixed unique check to skip the same table instences
sql/sql_delete.cc:
  removed next_independent to allow to check VIEW subqueries
sql/sql_insert.cc:
  removed next_independent to allow to check VIEW subqueries
sql/sql_parse.cc:
  removed next_independent to allow to check VIEW subqueries
sql/sql_update.cc:
  removed next_independent to allow to check VIEW subqueries
sql/sql_view.cc:
  removed next_independent to allow to check VIEW subqueries
  optimisation to mark as non-updatable views with subqueries by same table.
sql/table.h:
  removed next_independent to allow to check VIEW subqueries

1 files changed, 0 insertions, 8 deletions

diff --git a/sql/table.h b/sql/table.h
index 3e2a61d5a21..de048e7cc5c 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -232,8 +232,6 @@ typedef struct st_table_list
   st_table_list	*ancestor;
   /* most upper view this table belongs to */
   st_table_list	*belong_to_view;
-  /* next_global before adding VIEW tables */
-  st_table_list	*old_next;
   Item          *where;                 /* VIEW WHERE clause condition */
   Item          *check_option;          /* WITH CHECK OPTION condition */
   LEX_STRING	query;			/* text of (CRETE/SELECT) statement */
@@ -286,12 +284,6 @@ typedef struct st_table_list
   bool setup_ancestor(THD *thd, Item **conds, uint8 check_option);
   bool placeholder() {return derived || view; }
   void print(THD *thd, String *str);
-  inline st_table_list *next_independent()
-  {
-    if (view)
-      return old_next;
-    return next_global;
-  }
 } TABLE_LIST;
 
 class Item;