database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

5.0->5.1 merge

Browse Source 
remove options2 as it longer needed as serg put SELECT_ALL in bit 24, (removed something)
  making second word not needed
This commit is contained in:
joreland@mysql.com
2005-06-13 15:14:41 +02:00
parent 84a04b4a9d
commit 96522b90de
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_lex.cc
View File

@@ -135,7 +135,6 @@ void lex_start(THD *thd, uchar *buf,uint length)
lex->select_lex.link_next= lex->select_lex.slave= lex->select_lex.next= 0; lex->select_lex.link_next= lex->select_lex.slave= lex->select_lex.next= 0;
lex->select_lex.link_prev= (st_select_lex_node**)&(lex->all_selects_list); lex->select_lex.link_prev= (st_select_lex_node**)&(lex->all_selects_list);
lex->select_lex.options= 0; lex->select_lex.options= 0;
lex->select_lex.options2= 0;
lex->select_lex.init_order(); lex->select_lex.init_order();
lex->select_lex.group_list.empty(); lex->select_lex.group_list.empty();
lex->describe= 0; lex->describe= 0;
@@ -1065,7 +1064,6 @@ int yylex(void *arg, void *yythd)
void st_select_lex_node::init_query() void st_select_lex_node::init_query()
{ {
options= 0; options= 0;
options2= 0;
linkage= UNSPECIFIED_TYPE; linkage= UNSPECIFIED_TYPE;
no_error= no_table_names_allowed= 0; no_error= no_table_names_allowed= 0;
uncacheable= 0; uncacheable= 0;
@@ -1129,7 +1127,6 @@ void st_select_lex::init_select()
table_join_options= 0; table_join_options= 0;
in_sum_expr= with_wild= 0; in_sum_expr= with_wild= 0;
options= 0; options= 0;
options2= 0;
braces= 0; braces= 0;
when_list.empty(); when_list.empty();
expr_list.empty(); expr_list.empty();

1
sql/sql_lex.h
View File

@@ -297,7 +297,6 @@ protected:
public: public:
uint32 options; uint32 options;
uint32 options2;
/* /*
result of this query can't be cached, bit field, can be : result of this query can't be cached, bit field, can be :
UNCACHEABLE_DEPENDENT UNCACHEABLE_DEPENDENT

4
sql/sql_yacc.yy
View File

@@ -4029,7 +4029,7 @@ select_options:
/* empty*/ /* empty*/
| select_option_list | select_option_list
{ {
if (Select->options & SELECT_DISTINCT && Select->options2 & SELECT_ALL) if (Select->options & SELECT_DISTINCT && Select->options & SELECT_ALL)
{ {
my_error(ER_WRONG_USAGE, MYF(0), "ALL", "DISTINCT"); my_error(ER_WRONG_USAGE, MYF(0), "ALL", "DISTINCT");
YYABORT; YYABORT;
@@ -4069,7 +4069,7 @@ select_option:
{ {
Lex->select_lex.options|= OPTION_TO_QUERY_CACHE; Lex->select_lex.options|= OPTION_TO_QUERY_CACHE;
} }
| ALL { Select->options2|= SELECT_ALL; } | ALL { Select->options|= SELECT_ALL; }
; ;
select_lock_type: select_lock_type: