Changeset: f455febf0551 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f455febf0551 Modified Files: sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Windows sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows Branch: default Log Message:
Merge with Jan2014 branch. diffs (60 lines): diff --git a/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Windows b/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Windows --- a/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Windows +++ b/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Windows @@ -30,15 +30,15 @@ Ready. (u'l_discount', 524288, 60175) (u'l_extendedprice', 524288, 60175) (u'l_linenumber', 240700, 60175) -(u'l_linestatus', 60175, 60175) +(u'l_linestatus', 65536, 60175) (u'l_orderkey', 240700, 60175) (u'l_partkey', 240700, 60175) (u'l_quantity', 240700, 60175) (u'l_receiptdate', 240700, 60175) -(u'l_returnflag', 60175, 60175) +(u'l_returnflag', 65536, 60175) (u'l_shipdate', 240700, 60175) -(u'l_shipinstruct', 60175, 60175) -(u'l_shipmode', 60175, 60175) +(u'l_shipinstruct', 65536, 60175) +(u'l_shipmode', 65536, 60175) (u'l_suppkey', 240700, 60175) (u'l_tax', 524288, 60175) [(u'l_comment', 0), (u'l_commitdate', 0), (u'l_discount', 0), (u'l_extendedprice', 0), (u'l_linenumber', 0), (u'l_linestatus', 0), (u'l_orderkey', 0), (u'l_partkey', 0), (u'l_quantity', 0), (u'l_receiptdate', 0), (u'l_returnflag', 0), (u'l_shipdate', 0), (u'l_shipinstruct', 0), (u'l_shipmode', 0), (u'l_suppkey', 0), (u'l_tax', 0)] @@ -47,15 +47,15 @@ Ready. (u'l_discount', 524288, 0) (u'l_extendedprice', 524288, 0) (u'l_linenumber', 240700, 0) -(u'l_linestatus', 60175, 0) +(u'l_linestatus', 65536, 0) (u'l_orderkey', 240700, 0) (u'l_partkey', 240700, 0) (u'l_quantity', 240700, 0) (u'l_receiptdate', 240700, 0) -(u'l_returnflag', 60175, 0) +(u'l_returnflag', 65536, 0) (u'l_shipdate', 240700, 0) -(u'l_shipinstruct', 60175, 0) -(u'l_shipmode', 60175, 0) +(u'l_shipinstruct', 65536, 0) +(u'l_shipmode', 65536, 0) (u'l_suppkey', 240700, 0) (u'l_tax', 524288, 0) diff --git a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows --- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows +++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows @@ -80,10 +80,10 @@ stderr of test 'cardinality_violation.SF # 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808 # 21:00:43 > -MAPI = monetdb@GANS:39318 +MAPI = (monetdb) /var/tmp/mtest-28498/.s.monetdb.30263 QUERY = select * from env() as env where name = ( select 'prefix' from env() as env ); -ERROR = !cardinality violation (20>1) -MAPI = monetdb@GANS:39318 +ERROR = !cardinality violation (19>1) +MAPI = (monetdb) /var/tmp/mtest-28498/.s.monetdb.30263 QUERY = select * from columns where name = (select columns.name from _tables, columns where _tables.id = columns.table_id); ERROR = !cardinality violation (418>1) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
