diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 54e88e424cc..eedf4b30e73 100644
--- 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
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 4de73f7b789..f83bd24f5d3 100644
--- 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);