Merge

mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged

1 files changed, 12 insertions, 2 deletions

diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 7545f525082..f78f1171d06 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -79,6 +79,10 @@ enum enum_sql_command {
   SQLCOM_END
 };
 
+// describe/explain types
+#define DESCRIBE_NORMAL		1
+#define DESCRIBE_EXTENDED	2
+
 typedef List<Item> List_item;
 
 typedef struct st_lex_master_info
@@ -327,7 +331,9 @@ public:
   int prepare(THD *thd, select_result *result, bool tables_and_fields_initied);
   int exec();
   int cleanup();
-  
+
+  void print(String *str);
+
   friend void mysql_init_query(THD *thd);
   friend int subselect_union_engine::exec();
 private:
@@ -468,6 +474,9 @@ public:
     init_select();
   }
   bool setup_ref_array(THD *thd, uint order_group_num);
+  void print(THD *thd, String *str);
+  static void print_order(String *str, ORDER *order);
+  void print_limit(THD *thd, String *str);
 };
 typedef class st_select_lex SELECT_LEX;
 
@@ -542,9 +551,10 @@ typedef struct st_lex
   uint fk_delete_opt, fk_update_opt, fk_match_option;
   uint param_count;
   uint slave_thd_opt;
+  uint8 describe;
   bool drop_primary, drop_if_exists, drop_temporary, local_file;
   bool in_comment, ignore_space, verbose, simple_alter, no_write_to_binlog;
-  bool derived_tables, describe;
+  bool derived_tables;
   bool safe_to_cache_query;
   st_lex() {}
   inline void uncacheable()