diff options
author | unknown <bell@sanja.is.com.ua> | 2003-10-31 22:14:49 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2003-10-31 22:14:49 +0200 |
commit | 5337ffde112ebc041f4048fcc3b152ca6b4d5cec (patch) | |
tree | 2c6fd809f0c5f377f0c9be63a16c38f0853a56cf /sql/sql_lex.h | |
parent | ab9fb4ea752731bb04cfbd844902ae34c63123ab (diff) | |
parent | ed49917e8c9ea60797772ca8db638a3ae8580c3e (diff) | |
download | mariadb-git-5337ffde112ebc041f4048fcc3b152ca6b4d5cec.tar.gz |
merge
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
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_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index c31420b951c..20b796bb1ba 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -80,6 +80,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 @@ -335,7 +339,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: @@ -476,6 +482,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; @@ -550,9 +559,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() |