Commit 0a809431 authored by unknown's avatar unknown
Browse files

5.0->5.1 merge 

  remove options2 as it longer needed as serg put SELECT_ALL in bit 24, (removed something)
  making second word not needed


sql/sql_lex.cc:
  remove options2 as it no longer needed
sql/sql_lex.h:
  remove options2 as it no longer needed
sql/sql_yacc.yy:
  remove options2 as it no longer needed
parent a52035d1

sql/sql_lex.cc

+0 −3
Original line number Diff line number Diff line
@@ -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_prev= (st_select_lex_node**)&(lex->all_selects_list);

  lex->select_lex.options= 0;

  lex->select_lex.options2= 0;

  lex->select_lex.init_order();

  lex->select_lex.group_list.empty();

  lex->describe= 0;
@@ -1065,7 +1064,6 @@ int yylex(void *arg, void *yythd) 
void st_select_lex_node::init_query()

{

  options= 0;

  options2= 0;

  linkage= UNSPECIFIED_TYPE;

  no_error= no_table_names_allowed= 0;

  uncacheable= 0;
@@ -1129,7 +1127,6 @@ void st_select_lex::init_select() 
  table_join_options= 0;

  in_sum_expr= with_wild= 0;

  options= 0;

  options2= 0;

  braces= 0;

  when_list.empty();

  expr_list.empty();

sql/sql_lex.h

+0 −1
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ class st_select_lex_node { 
public:



  uint32 options;

  uint32 options2;

  /*

    result of this query can't be cached, bit field, can be :

      UNCACHEABLE_DEPENDENT

sql/sql_yacc.yy

+2 −2
Original line number Diff line number Diff line
@@ -4029,7 +4029,7 @@ select_options: 
	/* empty*/

	| 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");

              YYABORT;
@@ -4069,7 +4069,7 @@ select_option: 
	  {

	    Lex->select_lex.options|= OPTION_TO_QUERY_CACHE;

	  }

	| ALL		    { Select->options2|= SELECT_ALL; }

	| ALL		    { Select->options|= SELECT_ALL; }

	;



select_lock_type: