Merge remote-tracking branch '38316/fix-for-issue-38315' into aprilcomprs

Author: engcom-Charlie

app/code/Magento/Catalog/etc/db_schema.xml

@@ -135,6 +135,10 @@
         <index referenceId="CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
             <column name="attribute_id"/>
         </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID_ENTITY_ID" indexType="btree">
+            <column name="attribute_id"/>
+            <column name="entity_id"/>
+        </index>
         <index referenceId="CATALOG_PRODUCT_ENTITY_INT_STORE_ID" indexType="btree">
             <column name="store_id"/>
         </index>

app/code/Magento/Catalog/etc/db_schema_whitelist.json

@@ -69,6 +69,7 @@
         },
         "index": {
             "CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID_ENTITY_ID": true,
             "CATALOG_PRODUCT_ENTITY_INT_STORE_ID": true,
             "CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID_STORE_ID_VALUE": true
         },