new SELECT_LEX structure

mysql-test/r/derived.result:
  derived table bug test
mysql-test/t/derived.test:
  derived table bug test
sql/mysql_priv.h:
  new mysql_new_select call & layout fixing
sql/sql_class.h:
  passing unit as parameter of Table_ident constructor
sql/sql_lex.cc:
  new SELECT_LEX structure methods
sql/sql_lex.h:
  new SELECT_LEX structure definition
sql/table.h:
  fixed layout

1 files changed, 11 insertions, 8 deletions

diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index f1b60dd9b84..79343ef4ae0 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -28,21 +28,25 @@
 static const char *any_db="*any*";	// Special symbol for check_access
 
 
-int mysql_derived(THD *thd, LEX *lex,SELECT_LEX *s, TABLE_LIST *t)
+int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *s, TABLE_LIST *t)
 {
-  SELECT_LEX *sl=s;
+  /*
+    TODO: make derived tables with union inside (now only 1 SELECT may be
+    procesed)
+  */
+  SELECT_LEX *sl= (SELECT_LEX*)s->slave;
   List<Item> item_list;
   TABLE *table;
   int res;
   select_union *derived_result;
-  TABLE_LIST *tables=(TABLE_LIST *)sl->table_list.first;
+  TABLE_LIST *tables= (TABLE_LIST *)sl->table_list.first;
   TMP_TABLE_PARAM tmp_table_param;
   DBUG_ENTER("mysql_derived");
   
   if (tables)
-    res=check_table_access(thd,SELECT_ACL, tables);
+    res= check_table_access(thd,SELECT_ACL, tables);
   else
-    res=check_access(thd, SELECT_ACL, any_db);
+    res= check_access(thd, SELECT_ACL, any_db);
   if (res)
     DBUG_RETURN(-1);
 
@@ -52,7 +56,7 @@ int mysql_derived(THD *thd, LEX *lex,SELECT_LEX *s, TABLE_LIST *t)
   {
     if (cursor->derived)
     {
-      res=mysql_derived(thd,lex,(SELECT_LEX *)cursor->derived,cursor);
+      res=mysql_derived(thd, lex, (SELECT_LEX_UNIT *)cursor->derived, cursor);
       if (res) DBUG_RETURN(res);
     }
   }
@@ -103,9 +107,8 @@ int mysql_derived(THD *thd, LEX *lex,SELECT_LEX *s, TABLE_LIST *t)
 	{
 	  t->real_name=table->real_name;
 	  t->table=table;
-	  sl->prev->next=sl->next;
+	  sl->exclude();
 	  t->derived=(SELECT_LEX *)0; // just in case ...
-	  if (!sl->next) lex->last_select = sl;
 	}
       }
       delete derived_result;