diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-12-22 17:43:00 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-12-22 17:43:00 +0300 |
| commit | 3fb65a1ac27dab296f897f6f5b5fa9567129b0eb (patch) | |
| tree | d0a92cd222968b16e90701dee93e0539df59a5ce | |
| parent | 19c8976d854ecdd6ee50eeb58d3b4931998da8c7 (diff) | |
| download | mariadb-git-3fb65a1ac27dab296f897f6f5b5fa9567129b0eb.tar.gz | |
- Make testcase work for both debug and release
- Add opt_range_mrr.cc file into source repo
mysql-test/r/myisam_mrr.result:
Make testcase work for both debug and release
mysql-test/t/myisam_mrr.test:
Make testcase work for both debug and release
sql/Makefile.am:
- Add opt_range_mrr.cc file into source repo
| -rw-r--r-- | mysql-test/r/myisam_mrr.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/myisam_mrr.test | 1 | ||||
| -rw-r--r-- | sql/Makefile.am | 2 |
3 files changed, 3 insertions, 2 deletions
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) |