bk commit into 5.0 tree (sergefp:1.2024) BUG#14272

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 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.2024 05/10/25 16:34:03 sergefp@stripped +2 -0
  Fix for BUG#14272: Don't run index scan when we should use quick select.
  This could cause failures because there are table handlers (like federated)
  that support quick select scanning but do not support index scanning.
   

  sql/sql_update.cc
    1.176 05/10/25 16:33:56 sergefp@stripped +2 -2
    Fix for BUG#14272: Don't run index scan when we should use quick select.
    This could cause failures because there are table handlers (like federated)
    that support quick select scanning but do not support index scanning.
     

  mysql-test/t/disabled.def
    1.8 05/10/25 16:33:55 sergefp@stripped +0 -1
    Enabled federated testcase.

# 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-5.0-oct25-test

--- 1.175/sql/sql_update.cc	2005-10-19 01:52:02 +04:00
+++ 1.176/sql/sql_update.cc	2005-10-25 16:33:56 +04:00
@@ -286,7 +286,7 @@
     if (used_index < MAX_KEY && old_used_keys.is_set(used_index))
     {
       table->key_read=1;
-      table->file->extra(HA_EXTRA_KEYREAD); //todo: psergey: check
+      table->file->extra(HA_EXTRA_KEYREAD);
     }
 
     /* note: can actually avoid sorting below.. */
@@ -334,7 +334,7 @@
       /* If quick select is used, initialize it before retrieving rows. */
       if (select && select->quick && select->quick->reset())
         goto err;
-      if (used_index == MAX_KEY)
+      if (used_index == MAX_KEY || (select && select->quick))
         init_read_record(&info,thd,table,select,0,1);
       else
         init_read_record_idx(&info, thd, table, 1, used_index);

--- 1.7/mysql-test/t/disabled.def	2005-10-25 00:46:09 +04:00
+++ 1.8/mysql-test/t/disabled.def	2005-10-25 16:33:55 +04:00
@@ -15,4 +15,3 @@
 rpl_until       : Unstable test case, bug#12429
 rpl_deadlock    : Unstable test case, bug#12429
 kill            : Unstable test case, bug#9712
-federated       : Broken test case, bug#14272