bk commit into 5.1 tree (gkodinov:1.2392)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 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-01-22 12:58:14+02:00, gkodinov@stripped +3 -0
  Merge gkodinov@stripped:/home/bk/mysql-5.1-opt
  into  rakia.gmz:/home/kgeorge/mysql/autopush/B16590-5.1-opt
  MERGE: 1.2382.3.1

  mysql-test/r/order_by.result@stripped, 2007-01-22 12:58:08+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.59.1.1

  mysql-test/t/order_by.test@stripped, 2007-01-22 12:58:08+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.42.1.1

  sql/sql_select.cc@stripped, 2007-01-22 12:58:08+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.477.1.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:	rakia.gmz
# Root:	/home/kgeorge/mysql/autopush/B16590-5.1-opt/RESYNC

--- 1.478/sql/sql_select.cc	2007-01-10 12:06:19 +02:00
+++ 1.479/sql/sql_select.cc	2007-01-22 12:58:08 +02:00
@@ -7722,6 +7722,22 @@ static void update_const_equal_items(CON
         key_map possible_keys= field->key_start;
         possible_keys.intersect(field->table->keys_in_use_for_query);
         stat[0].const_keys.merge(possible_keys);
+
+        /*
+          For each field in the multiple equality (for which we know that it 
+          is a constant) we have to find its corresponding key part, and set 
+          that key part in const_key_parts.
+        */  
+        if (!possible_keys.is_clear_all())
+        {
+          TABLE *tab= field->table;
+          KEYUSE *use;
+          for (use= stat->keyuse; use && use->table == tab; use++)
+            if (possible_keys.is_set(use->key) && 
+                tab->key_info[use->key].key_part[use->keypart].field ==
+                field)
+              tab->const_key_parts[use->key]|= use->keypart_map;
+        }
       }
     }
   }

--- 1.60/mysql-test/r/order_by.result	2007-01-12 12:47:54 +02:00
+++ 1.61/mysql-test/r/order_by.result	2007-01-22 12:58:08 +02:00
@@ -926,3 +926,12 @@ NULL
 2
 3
 DROP TABLE t1,t2,t3,t4;
+CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a), UNIQUE KEY b (b));
+INSERT INTO t1 VALUES (1,1),(2,2);
+CREATE TABLE t2 (a INT, b INT, KEY a (a,b));
+INSERT INTO t2 VALUES (1,1),(1,2),(2,1),(2,2);
+EXPLAIN SELECT 1 FROM t1,t2 WHERE t1.b=2 AND t1.a=t2.a ORDER BY t2.b;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	const	PRIMARY,b	b	5	const	1	
+1	SIMPLE	t2	ref	a	a	5	const	2	Using where; Using index
+DROP TABLE t1,t2;

--- 1.43/mysql-test/t/order_by.test	2007-01-12 12:47:54 +02:00
+++ 1.44/mysql-test/t/order_by.test	2007-01-22 12:58:08 +02:00
@@ -640,3 +640,16 @@ SELECT t2.b FROM t1 LEFT JOIN (t2, t3 LE
 ON (t1.a=t2.a AND t1.b=t3.b) order by t2.b;
 
 DROP TABLE t1,t2,t3,t4;
+
+#
+# BUG#16590: Optimized does not do right "const" table pre-read
+#
+CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a), UNIQUE KEY b (b));
+INSERT INTO t1 VALUES (1,1),(2,2);
+
+CREATE TABLE t2 (a INT, b INT, KEY a (a,b));
+INSERT INTO t2 VALUES (1,1),(1,2),(2,1),(2,2);
+
+EXPLAIN SELECT 1 FROM t1,t2 WHERE t1.b=2 AND t1.a=t2.a ORDER BY t2.b;
+
+DROP TABLE t1,t2;