bk commit into 4.1 tree (sergefp:1.2149)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
4.1 repository of psergey. When psergey 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
  1.2149 05/03/30 14:36:04 sergefp@stripped +1 -0
  Post review fixes for BUG@9213:
   Removed redundant assignment, added comments.

  sql/sql_select.cc
    1.391 05/03/30 14:35:35 sergefp@stripped +3 -3
    Post review fixes for BUG@9213:
     Removed redundant assignment, added comments.

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-4.1-bug9213

--- 1.390/sql/sql_select.cc	2005-03-27 21:43:03 +04:00
+++ 1.391/sql/sql_select.cc	2005-03-30 14:35:35 +04:00
@@ -7184,8 +7184,9 @@
 	if (tab->ref.key >= 0)
 	{
           /*
-            We'll use ref access on key new_ref_key, and need to construct a
-            tab->ref for it.
+            We'll use ref access method on key new_ref_key. In general case 
+            index search tuple for new_ref_key will be different, so we build
+            it from scratch here.
           */
           KEYUSE *keyuse= tab->keyuse;
           while (keyuse->key != new_ref_key && keyuse->table ==
tab->table)
@@ -7193,7 +7194,6 @@
           if (create_ref_for_key(tab->join, tab, keyuse, 
                                  tab->join->const_table_map))
             DBUG_RETURN(0);
-          tab->ref.key= new_ref_key;
 	}
 	else
 	{