bk commit into 5.0 tree (gkodinov:1.2472)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-09 16:30:44+02:00, gkodinov@stripped +3 -0
  Merge bk-internal:/home/bk/mysql-5.0-opt
  into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge
  MERGE: 1.2341.91.1

  mysql-test/r/select.result@stripped, 2007-03-09 16:30:42+02:00, gkodinov@stripped +0 -0
    merge
    MERGE: 1.143.3.1

  mysql-test/t/select.test@stripped, 2007-03-09 16:30:42+02:00, gkodinov@stripped +0 -1
    merge
    MERGE: 1.117.3.1

  sql/sql_yacc.yy@stripped, 2007-03-09 16:25:24+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.498.7.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gkodinov
# Host:	magare.gmz
# Root:	/home/kgeorge/mysql/work/WL3527-5.0-opt-merge/RESYNC

--- 1.509/sql/sql_yacc.yy	2007-03-07 11:24:42 +02:00
+++ 1.510/sql/sql_yacc.yy	2007-03-09 16:25:24 +02:00
@@ -1092,7 +1092,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
 	key_alg opt_btree_or_rtree
 
 %type <string_list>
-	key_usage_list using_list
+	key_usage_list key_usage_list_inner using_list
 
 %type <key_part>
 	key_part
@@ -5899,6 +5899,10 @@ opt_outer:
 	/* empty */	{}
 	| OUTER		{};
 
+opt_for_join:
+        /* empty */
+        | FOR_SYM JOIN_SYM;
+
 opt_key_definition:
 	/* empty */	{}
 	| USE_SYM    key_usage_list
@@ -5914,15 +5918,20 @@ opt_key_definition:
 	    sel->use_index_ptr= &sel->use_index;
 	    sel->table_join_options|= TL_OPTION_FORCE_INDEX;
 	  }
-	| IGNORE_SYM key_usage_list
+	| IGNORE_SYM key_or_index opt_for_join key_usage_list_inner
 	  {
 	    SELECT_LEX *sel= Select;
-	    sel->ignore_index= *$2;
+	    sel->ignore_index= *$4;
 	    sel->ignore_index_ptr= &sel->ignore_index;
 	  };
 
 key_usage_list:
-	key_or_index { Select->interval_list.empty(); }
+	key_or_index key_usage_list_inner
+        { $$= $2; }
+	;
+
+key_usage_list_inner:
+	{ Select->interval_list.empty(); }
         '(' key_list_or_empty ')'
         { $$= &Select->interval_list; }
 	;

--- 1.151/mysql-test/r/select.result	2007-02-15 08:06:39 +02:00
+++ 1.152/mysql-test/r/select.result	2007-03-09 16:30:42 +02:00
@@ -3628,6 +3628,15 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	t2	range	si,ai	si	5	NULL	2	Using where
 1	SIMPLE	t3	eq_ref	PRIMARY,ci	PRIMARY	4	test.t2.a	1	Using where
 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;
+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 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
+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 );
 INSERT INTO t1 VALUES (1,1,1,0,0,0,0),(2,1,1,3,8,1,0),(3,1,1,4,12,1,0);

--- 1.125/mysql-test/t/select.test	2007-02-15 08:06:39 +02:00
+++ 1.126/mysql-test/t/select.test	2007-03-09 16:30:42 +02:00
@@ -3103,7 +3103,16 @@ SELECT t3.a FROM t1,t2,t3
         t3.c IN ('bb','ee');
 
 DROP TABLE t1,t2,t3;
- 
+
+#
+# WL3527: Extend IGNORE INDEX so places where index is ignored can 
+#         be specified
+#       
+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;
+DROP TABLE t1;
+
 #
 # Bug#25172: Not checked buffer size leads to a server crash
 #