Merge

eb57f520 · sergefp@mysql.com · 1eaf95d5 · 56aeee44 · eb57f520 · eb57f520
Commit eb57f520 authored Oct 28, 2005 by sergefp@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

mysql-test/t/disabled.def mysql-test/t/disabled.def +0 -1

sql/sql_update.cc sql/sql_update.cc +1 -1

No files found.
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -15,5 +15,4 @@ rpl_relayrotate : Unstable test case, bug#12429
 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
 archive_gis     : The test fails on 32bit Linux
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -336,7 +336,7 @@ int mysql_update(THD *thd,
      /* 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);