subselect transformation moved in after-fix_field place

removed "of is null" if it is possible
  (this cset should be SCRUM related, but not approved as scrum task yet)

1 files changed, 2 insertions, 9 deletions

diff --git a/sql/table.h b/sql/table.h
index 2aefe23cb2f..abe867246dc 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -163,15 +163,8 @@ typedef struct st_table_list
   struct st_table_list *natural_join;	/* natural join on this table*/
   /* ... join ... USE INDEX ... IGNORE INDEX */
   List<String>	*use_index, *ignore_index; 
-  /*
-    Usually hold reference on opened table, but may hold reference
-    to node of complete list of tables used in UNION & subselect.
-  */
-  union
-  {
-    TABLE          *table;      /* opened table */
-    st_table_list  *table_list; /* pointer to node of list of all tables */
-  };
+  TABLE          *table;      /* opened table */
+  st_table_list  *table_list; /* pointer to node of list of all tables */
   class st_select_lex_unit *derived;	/* SELECT_LEX_UNIT of derived table */
  GRANT_INFO	grant;
   thr_lock_type lock_type;