Fix compil after backport

jimczi · jimczi · commit 86e5f0082d8e · 2018-06-05T10:01:40.000+02:00
Relates #31066
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/190_index_prefix_search.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/190_index_prefix_search.yml
@@ -66,7 +66,7 @@ setup:
 ---
 "search index prefixes with span_multi":
   - skip:
-      version: " - 6.99.99"
+      version: " - 6.2.99"
       reason: span_multi throws an exception with prefix fields on < versions
 
   - do:
diff --git a/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java
@@ -59,7 +59,7 @@ protected void initializeAdditionalMappings(MapperService mapperService) throws
             .endObject().endObject().endObject();
 
         mapperService.merge("_doc",
-            new CompressedXContent(Strings.toString(mapping)), MapperService.MergeReason.MAPPING_UPDATE);
+            new CompressedXContent(Strings.toString(mapping)), MapperService.MergeReason.MAPPING_UPDATE, true);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ protected void initializeAdditionalMappings(MapperService mapperService) throws`
`59`	`59`	`.endObject().endObject().endObject();`
`60`	`60`
`61`	`61`	`mapperService.merge("_doc",`
`62`		`- new CompressedXContent(Strings.toString(mapping)), MapperService.MergeReason.MAPPING_UPDATE);`
	`62`	`+ new CompressedXContent(Strings.toString(mapping)), MapperService.MergeReason.MAPPING_UPDATE, true);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`