diff options
| author | pem@mysql.com <> | 2004-04-07 19:07:44 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2004-04-07 19:07:44 +0200 |
| commit | dfd59e296e2c267a21f1ea8b3b937e07730dad0d (patch) | |
| tree | e5ac1517ff3dccc42352b7bac39ecd1c093d0ae6 /sql/sql_lex.h | |
| parent | 1541f2e7949416d6e172ef6406ecf140d3b26659 (diff) | |
| parent | 61fd95d168b51092b7ce3ff56b2c8c8ed1a49c0f (diff) | |
| download | mariadb-git-dfd59e296e2c267a21f1ea8b3b937e07730dad0d.tar.gz | |
Merge 4.1 -> 5.0.
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 43d9b013239..7a5a1c13f80 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -347,7 +347,7 @@ public: /* fake SELECT_LEX for union processing */ st_select_lex *fake_select_lex; - uint union_option; + st_select_lex *union_distinct; /* pointer to the last UNION DISTINCT */ void init_query(); bool create_total_list(THD *thd, st_lex *lex, TABLE_LIST **result); @@ -367,6 +367,8 @@ public: int prepare(THD *thd, select_result *result, ulong additional_options); int exec(); int cleanup(); + inline void unclean() { cleaned= 0; } + void reinit_exec_mechanism(); bool check_updateable(char *db, char *table); void print(String *str); @@ -409,6 +411,7 @@ public: SQL_LIST order_list; /* ORDER clause */ List<List_item> expr_list; List<List_item> when_list; /* WHEN clause (expression) */ + SQL_LIST *gorder_list; ha_rows select_limit, offset_limit; /* LIMIT clause parameters */ // Arrays of pointers to top elements of all_fields list Item **ref_pointer_array; @@ -553,13 +556,12 @@ typedef struct st_lex String *wild; sql_exchange *exchange; select_result *result; - Item *default_value; + Item *default_value, *on_update_value; LEX_STRING *comment, name_and_length; LEX_USER *grant_user; gptr yacc_yyss,yacc_yyvs; THD *thd; CHARSET_INFO *charset; - SQL_LIST *gorder_list; List<key_part_spec> col_list; List<key_part_spec> ref_list; @@ -573,7 +575,7 @@ typedef struct st_lex List<Item> *insert_list,field_list,value_list; List<List_item> many_values; List<set_var_base> var_list; - List<Item> param_list; + List<Item_param> param_list; SQL_LIST proc_list, auxilliary_table_list, save_list; TYPELIB *interval; create_field *last_field; @@ -598,7 +600,6 @@ typedef struct st_lex uint uint_geom_type; uint grant, grant_tot_col, which_columns; uint fk_delete_opt, fk_update_opt, fk_match_option; - uint param_count; uint slave_thd_opt; uint8 describe; bool drop_if_exists, drop_temporary, local_file; |