Merge remote-tracking branch 'origin/MAGETWO-38384' into develop

Author: Joan He

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

@@ -2713,14 +2713,11 @@ public function prepareSqlCondition($fieldName, $condition)
             'to'            => "{{fieldName}} <= ?",
             'seq'           => null,
             'sneq'          => null,
+            'ntoa'          => "INET_NTOA({{fieldName}}) LIKE ?",
         ];
 
         $query = '';
         if (is_array($condition)) {
-            if (isset($condition['field_expr'])) {
-                $fieldName = str_replace('#?', $this->quoteIdentifier($fieldName), $condition['field_expr']);
-                unset($condition['field_expr']);
-            }
             $key = key(array_intersect_key($condition, $conditionKeyMap));
 
             if (isset($condition['from']) || isset($condition['to'])) {