Commit 6e93d293 authored by unknown's avatar unknown
Browse files

WL3527: 5.0 part: 

enabled the optional FOR JOIN to all the three
clauses : USE, FORCE and IGNORE


mysql-test/r/select.result:
  WL3527: 5.0 part: test cases
mysql-test/t/select.test:
  WL3527: 5.0 part: test cases
parent ec5051ff

mysql-test/r/select.result

+6 −0
Original line number Diff line number Diff line
@@ -3636,6 +3636,12 @@ id select_type table type possible_keys key key_len ref rows Extra 
EXPLAIN SELECT 1 FROM t1 IGNORE INDEX FOR JOIN (a) WHERE a = 1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

EXPLAIN SELECT 1 FROM t1 USE INDEX FOR JOIN (a) WHERE a = 1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	a	a	5	const	1	Using where; Using index

EXPLAIN SELECT 1 FROM t1 FORCE INDEX FOR JOIN (a) WHERE a = 1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	a	a	5	const	1	Using where; Using index

DROP TABLE t1;

CREATE TABLE t1 ( f1 int primary key, f2 int, f3 int, f4 int, f5 int, f6 int, checked_out int);

CREATE TABLE t2 ( f11 int PRIMARY KEY );

mysql-test/t/select.test

+2 −0
Original line number Diff line number Diff line
@@ -3111,6 +3111,8 @@ DROP TABLE t1,t2,t3; 
CREATE TABLE t1 (a INT, b INT, KEY (a)); INSERT INTO t1 VALUES (1,1),(2,2);

EXPLAIN SELECT 1 FROM t1 WHERE a = 1;

EXPLAIN SELECT 1 FROM t1 IGNORE INDEX FOR JOIN (a) WHERE a = 1;

EXPLAIN SELECT 1 FROM t1 USE INDEX FOR JOIN (a) WHERE a = 1;

EXPLAIN SELECT 1 FROM t1 FORCE INDEX FOR JOIN (a) WHERE a = 1;

DROP TABLE t1;



#

sql/sql_yacc.yy

+4 −8
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); 
	key_alg opt_btree_or_rtree



%type <string_list>

	key_usage_list key_usage_list_inner using_list

	key_usage_list using_list



%type <key_part>

	key_part
@@ -5907,19 +5907,15 @@ opt_key_definition: 
	    sel->use_index_ptr= &sel->use_index;

	    sel->table_join_options|= TL_OPTION_FORCE_INDEX;

	  }

	| IGNORE_SYM key_or_index opt_for_join key_usage_list_inner

	| IGNORE_SYM key_usage_list

	  {

	    SELECT_LEX *sel= Select;

	    sel->ignore_index= *$4;

	    sel->ignore_index= *$2;

	    sel->ignore_index_ptr= &sel->ignore_index;

	  };



key_usage_list:

	key_or_index key_usage_list_inner

        { $$= $2; }

	;



key_usage_list_inner:

        key_or_index opt_for_join      

	{ Select->interval_list.empty(); }

        '(' key_list_or_empty ')'

        { $$= &Select->interval_list; }