Changeset: b3436cde5e2d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3436cde5e2d Modified Files: sql/server/rel_optimizer.c sql/test/miscellaneous/Tests/deallocate.stable.out Branch: default Log Message:
Use the right flag and re-approved test diffs (33 lines): diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c --- a/sql/server/rel_optimizer.c +++ b/sql/server/rel_optimizer.c @@ -9767,7 +9767,7 @@ optimize_rel(mvc *sql, sql_rel *rel, int rel = rel_visitor_topdown(&v, rel, &rel_simplify_fk_joins); } - if (gp.cnt[op_select] && sql->emode != m_prepare) + if (gp.cnt[op_select] && value_based_opt) rel = rel_visitor_bottomup(&v, rel, &rel_simplify_like_select); if (gp.cnt[op_select]) diff --git a/sql/test/miscellaneous/Tests/deallocate.stable.out b/sql/test/miscellaneous/Tests/deallocate.stable.out --- a/sql/test/miscellaneous/Tests/deallocate.stable.out +++ b/sql/test/miscellaneous/Tests/deallocate.stable.out @@ -87,7 +87,7 @@ stdout of test 'deallocate` in directory [ "prepare select \"system\" or ? from sys._tables where false;", 0, 0, "boolean", 1, 0, NULL, "%1", "%1" ] [ "prepare select \"system\" or ? from sys._tables where false;", 1, 1, "boolean", 1, 0, NULL, NULL, NULL ] #EXEC 3(false); -% .%1 # table_name +% sys.%1 # table_name % %1 # name % boolean # type % 5 # length @@ -124,7 +124,7 @@ stdout of test 'deallocate` in directory [ "boolean", 1, 0, "", "%1", "%1" ] [ "boolean", 1, 0, NULL, NULL, NULL ] #execute 15(false); -% .%1 # table_name +% sys.%1 # table_name % %1 # name % boolean # type % 5 # length _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list