1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WL3527: 5.0 part:

Browse Source 
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
This commit is contained in:
unknown 2007-03-26 16:52:52 +03:00
parent ec5051fff4
commit 6e93d2939d
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/select.result
View File

@ -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; 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 id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using where 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; 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 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 ); CREATE TABLE t2 ( f11 int PRIMARY KEY );

2
mysql-test/t/select.test
View File

@ -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); 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 WHERE a = 1;
EXPLAIN SELECT 1 FROM t1 IGNORE INDEX FOR JOIN (a) 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; DROP TABLE t1;
# #

12
sql/sql_yacc.yy
View File

@ -1092,7 +1092,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
key_alg opt_btree_or_rtree key_alg opt_btree_or_rtree
%type <string_list> %type <string_list>
key_usage_list key_usage_list_inner using_list key_usage_list using_list
%type <key_part> %type <key_part>
key_part key_part
@ -5907,19 +5907,15 @@ opt_key_definition:
sel->use_index_ptr= &sel->use_index; sel->use_index_ptr= &sel->use_index;
sel->table_join_options|= TL_OPTION_FORCE_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; SELECT_LEX *sel= Select;
sel->ignore_index= *$4; sel->ignore_index= *$2;
sel->ignore_index_ptr= &sel->ignore_index; sel->ignore_index_ptr= &sel->ignore_index;
}; };
key_usage_list: key_usage_list:
key_or_index key_usage_list_inner key_or_index opt_for_join
{ $$= $2; }
;
key_usage_list_inner:
{ Select->interval_list.empty(); } { Select->interval_list.empty(); }
'(' key_list_or_empty ')' '(' key_list_or_empty ')'
{ $$= &Select->interval_list; } { $$= &Select->interval_list; }