Changeset: 6c19c61164e2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c19c61164e2
Modified Files:
monetdb5/modules/kernel/algebra.mx
sql/test/testdb/Tests/testdb-dump.timeout
Branch: sciql
Log Message:
Merge with default branch.
diffs (18 lines):
diff --git a/monetdb5/modules/kernel/algebra.mx
b/monetdb5/modules/kernel/algebra.mx
--- a/monetdb5/modules/kernel/algebra.mx
+++ b/monetdb5/modules/kernel/algebra.mx
@@ -579,7 +579,7 @@ address ALGmarkHead
comment "Produces a new BAT with fresh unique dense sequense of OIDs in
the head that starts at base (i.e. [base,..base+b.count()-1]
).";
-command markH( b:bat[:any_1,:any_2], nr_parts:int, part_nr:int )
:bat[:any_1,:oid]
+command markH( b:bat[:any_1,:any_2], nr_parts:int, part_nr:int )
:bat[:oid,:any_2]
address ALGhmarkp
comment "Produces a BAT with fresh unique dense sequense of OIDs in
the head that starts at base (i.e. [base,..base+b.count()-1] ).
diff --git a/sql/test/testdb/Tests/testdb-dump.timeout
b/sql/test/testdb/Tests/testdb-dump.timeout
--- a/sql/test/testdb/Tests/testdb-dump.timeout
+++ b/sql/test/testdb/Tests/testdb-dump.timeout
@@ -1,1 +1,1 @@
-19
+36
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
