diff --git a/mysql-test/r/myisam_mrr.result b/mysql-test/r/myisam_mrr.result
index ed643aed185..7d6bc9dd963 100644
--- a/mysql-test/r/myisam_mrr.result
+++ b/mysql-test/r/myisam_mrr.result
@@ -394,7 +394,7 @@ drop table t0, t1;
 #   - engine_condition_pushdown does not affect ICP
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_condition_pushdown=on,table_elimination=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_condition_pushdown=on
 create table t0 (a int);
 insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t1 (a int, b int, key(a));
diff --git a/mysql-test/t/myisam_mrr.test b/mysql-test/t/myisam_mrr.test
index b8d750d55a7..4ea60b4f694 100644
--- a/mysql-test/t/myisam_mrr.test
+++ b/mysql-test/t/myisam_mrr.test
@@ -103,6 +103,7 @@ drop table t0, t1;
 
 
 # Check that optimizer_switch is present
+--replace_regex /,table_elimination=o[nf]*//
 select @@optimizer_switch;
 
 # Check if it affects ICP 
diff --git a/sql/Makefile.am b/sql/Makefile.am
index c6d480b3411..06b5bcd9b50 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -154,7 +154,7 @@ BUILT_SOURCES =		$(BUILT_MAINT_SRC) lex_hash.h link_sources
 EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_MAINT_SRC) \
 			nt_servc.cc nt_servc.h \
 			message.mc  message.h message.rc MSG00001.bin \
-			CMakeLists.txt
+			CMakeLists.txt opt_range_mrr.cc
 
 CLEANFILES =        	lex_hash.h sql_yacc.output link_sources
 DISTCLEANFILES =        $(EXTRA_PROGRAMS)