database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-29 21:42:28 +03:00
Code

- Make testcase work for both debug and release

Browse Source 
- 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
This commit is contained in:
Sergey Petrunya 2009-12-22 17:43:00 +03:00
parent 19c8976d85
commit 3fb65a1ac2
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/myisam_mrr.result
View File

@ -394,7 +394,7 @@ drop table t0, t1;
# - engine_condition_pushdown does not affect ICP # - engine_condition_pushdown does not affect ICP
select @@optimizer_switch; select @@optimizer_switch;
@@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); create table t0 (a int);
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t1 (a int, b int, key(a)); create table t1 (a int, b int, key(a));

1
mysql-test/t/myisam_mrr.test
View File

@ -103,6 +103,7 @@ drop table t0, t1;
# Check that optimizer_switch is present # Check that optimizer_switch is present
--replace_regex /,table_elimination=o[nf]*//
select @@optimizer_switch; select @@optimizer_switch;
# Check if it affects ICP # Check if it affects ICP

2
sql/Makefile.am
View File

@ -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) \ EXTRA_DIST = udf_example.c udf_example.def $(BUILT_MAINT_SRC) \
nt_servc.cc nt_servc.h \ nt_servc.cc nt_servc.h \
message.mc message.h message.rc MSG00001.bin \ 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 CLEANFILES = lex_hash.h sql_yacc.output link_sources
DISTCLEANFILES = $(EXTRA_PROGRAMS) DISTCLEANFILES = $(EXTRA_PROGRAMS)