MonetDB: default - Merge with Apr2011 branch:

[Stefan Manegold]

Changeset: b569bcc61bec for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b569bcc61bec
Modified Files:
        sql/backends/monet5/sql_gencode.mx
        sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
        sql/benchmarks/tpch/Tests/01-22.stable.out
        sql/server/rel_optimizer.c
        sql/server/rel_prop.c
        sql/server/rel_prop.h
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/view_on_deleted_table.SF-938583.stable.out
        
sql/test/BugTracker-2009/Tests/lookup_column_name_bug_1.SF-2654300.stable.out
        
sql/test/BugTracker-2009/Tests/lookup_column_name_bug_2.SF-2656762.stable.out
        sql/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.out
        
sql/test/BugTracker/Tests/nested_views_algebra_version.SF-1993765.stable.out
        sql/test/BugTracker/Tests/variable_stack_crash.SF-1711251-2.stable.out
        sql/test/BugTracker/Tests/variable_stack_crash.SF-1711251.stable.out
        sql/test/osm/Tests/exp_name_bug.stable.out
        sql/test/xquery/Tests/q01.stable.out
Branch: default
Log Message:

Merge with Apr2011 branch:
merging with Niels' back-ported changeset f33773f721a8;
no actual changes;
files sql/backends/monet5/sql_gencode.mx, sql/server/rel_prop.c, 
sql/server/rel_prop.h,
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out, 
sql/benchmarks/tpch/Tests/01-22.stable.out
already contained the changes;
ignoring conflicts in sql/server/rel_optimizer.c, assuming they are only due to
new features in the default branch;
also ignoring conflicts in 
sql/test/BugDay_2005-10-06_2.9.3/Tests/view_on_deleted_table.SF-938583.stable.out,
sql/test/BugTracker-2009/Tests/lookup_column_name_bug_1.SF-2654300.stable.out,
sql/test/BugTracker-2009/Tests/lookup_column_name_bug_2.SF-2656762.stable.out,
sql/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.out,
sql/test/BugTracker/Tests/nested_views_algebra_version.SF-1993765.stable.out,
sql/test/BugTracker/Tests/variable_stack_crash.SF-1711251-2.stable.out,
sql/test/BugTracker/Tests/variable_stack_crash.SF-1711251.stable.out,
sql/test/osm/Tests/exp_name_bug.stable.out,
sql/test/xquery/Tests/q01.stable.out,
where necessary, stable output in the default branch needs to be checked
and re-approved.

_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list