Merge remote-tracking branch 'tango/MAGETWO-94096' into PR-2008-2.3-tmp

Author: dhorytskyi

app/code/Magento/Sales/Model/ResourceModel/Grid.php

@@ -93,15 +93,20 @@ public function refresh($value, $field = null)
     {
         $select = $this->getGridOriginSelect()
             ->where(($field ?: $this->mainTableName . '.entity_id') . ' = ?', $value);
-        return $this->getConnection()->query(
-            $this->getConnection()
-                ->insertFromSelect(
-                    $select,
-                    $this->getTable($this->gridTableName),
-                    array_keys($this->columns),
-                    AdapterInterface::INSERT_ON_DUPLICATE
-                )
-        );
+        $sql = $this->getConnection()
+            ->insertFromSelect(
+                $select,
+                $this->getTable($this->gridTableName),
+                array_keys($this->columns),
+                AdapterInterface::INSERT_ON_DUPLICATE
+            );
+
+        $this->addCommitCallback(function () use ($sql) {
+            $this->getConnection()->query($sql);
+        });
+
+        // need for backward compatibility
+        return $this->getConnection()->query($sql);
     }
 
     /**