Merge branch '11.0' into 11.1bb-11.1-release

1 files changed, 12 insertions, 1 deletions

diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 86d8cdb7cee..bb8cd2b2db1 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -1302,7 +1302,18 @@ public:
       The following code is not safe if you are using different
       storage engines or different index types per partition.
     */
-    return m_file[0]->index_flags(inx, part, all_parts);
+    ulong part_flags= m_file[0]->index_flags(inx, part, all_parts);
+
+    /*
+      The underlying storage engine might support Rowid Filtering. But
+      ha_partition does not forward the needed SE API calls, so the feature
+      will not be used.
+
+      Note: It's the same with IndexConditionPushdown, except for its variant
+      of IndexConditionPushdown+BatchedKeyAccess (that one works). Because of
+      that, we do not clear HA_DO_INDEX_COND_PUSHDOWN here.
+    */
+    return part_flags & ~HA_DO_RANGE_FILTER_PUSHDOWN;
   }
 
   /**