maria-developers team mailing list archive

[Sergey Petrunya <psergey@xxxxxxxxxxxx>]

At file:///home/psergey/dev/maria-5.2-dsmrr/

------------------------------------------------------------
revno: 2742
revision-id: psergey@xxxxxxxxxxxx-20091222144300-uzde3zs7tbg40lml
parent: psergey@xxxxxxxxxxxx-20091222124915-o7lf73nr9z66mwsb
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: maria-5.2-dsmrr
timestamp: Tue 2009-12-22 17:43:00 +0300
message:
  - Make testcase work for both debug and release
  - Add opt_range_mrr.cc file into source repo
=== modified file 'mysql-test/r/myisam_mrr.result'
--- a/mysql-test/r/myisam_mrr.result	2009-12-22 12:33:21 +0000
+++ b/mysql-test/r/myisam_mrr.result	2009-12-22 14:43:00 +0000
@@ -394,7 +394,7 @@
 #   - 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));

=== modified file 'mysql-test/t/myisam_mrr.test'
--- a/mysql-test/t/myisam_mrr.test	2009-12-22 12:33:21 +0000
+++ b/mysql-test/t/myisam_mrr.test	2009-12-22 14:43:00 +0000
@@ -103,6 +103,7 @@
 
 
 # Check that optimizer_switch is present
+--replace_regex /,table_elimination=o[nf]*//
 select @@optimizer_switch;
 
 # Check if it affects ICP 

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2009-12-22 12:49:15 +0000
+++ b/sql/Makefile.am	2009-12-22 14:43:00 +0000
@@ -154,7 +154,7 @@
 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)