new EXPLAIN

fixed bug in mysql-test/create-test-result
fixed bug in union-subselect engine


mysql-test/create-test-result:
  fixed bug in reject file name assembling
mysql-test/r/compare.result:
  new EXPLAIN
mysql-test/r/create.result:
  new EXPLAIN
mysql-test/r/distinct.result:
  new EXPLAIN
mysql-test/r/explain.result:
  new EXPLAIN
mysql-test/r/group_by.result:
  new EXPLAIN
mysql-test/r/heap.result:
  new EXPLAIN
mysql-test/r/heap_btree.result:
  new EXPLAIN
mysql-test/r/heap_hash.result:
  new EXPLAIN
mysql-test/r/innodb.result:
  new EXPLAIN
mysql-test/r/join_outer.result:
  new EXPLAIN
mysql-test/r/key_diff.result:
  new EXPLAIN
mysql-test/r/key_primary.result:
  new EXPLAIN
mysql-test/r/merge.result:
  new EXPLAIN
mysql-test/r/myisam.result:
  new EXPLAIN
mysql-test/r/null_key.result:
  new EXPLAIN
mysql-test/r/odbc.result:
  new EXPLAIN
mysql-test/r/order_by.result:
  new EXPLAIN
mysql-test/r/range.result:
  new EXPLAIN
mysql-test/r/select.result:
  new EXPLAIN
mysql-test/r/subselect.result:
  new EXPLAIN
mysql-test/r/type_datetime.result:
  new EXPLAIN
mysql-test/r/union.result:
  new EXPLAIN
mysql-test/r/user_var.result:
  new EXPLAIN
mysql-test/r/varbinary.result:
  new EXPLAIN
mysql-test/t/subselect.test:
  new EXPLAIN
mysql-test/t/union.test:
  new EXPLAIN
sql/mysql_priv.h:
  new EXPLAIN
sql/sql_class.cc:
  new EXPLAIN
sql/sql_class.h:
  new EXPLAIN
sql/sql_derived.cc:
  new EXPLAIN
sql/sql_lex.h:
  new EXPLAIN
sql/sql_parse.cc:
  new EXPLAIN
sql/sql_select.cc:
  new EXPLAIN
sql/sql_union.cc:
  fixed bug in subselect-UNION engine
sql/table.h:
  new EXPLAIN

1 files changed, 3 insertions, 0 deletions

diff --git a/sql/table.h b/sql/table.h
index b89701bfc8e..3b8a62a09b5 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -128,6 +128,9 @@ struct st_table {
 
   uint          temp_pool_slot;
 
+  /* number of select if it is derived table */
+  uint          derived_select_number;   
+
   THD		*in_use;			/* Which thread uses this */
   struct st_table *next,*prev;
 };