Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31055/src/backends/monet5
Modified Files:
sql.mx
Log Message:
fix compilation (unused variable c)
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- sql.mx 25 Feb 2008 22:16:49 -0000 1.255
+++ sql.mx 27 Feb 2008 17:52:35 -0000 1.256
@@ -601,11 +601,14 @@
function sql.zero_or_one( b:bat[:oid,:any_1], gp:bat[:oid,:oid],
gpe:bat[:oid,:oid]) :bat[:oid,:any_1];
(e,g) := group.new(gp);
m := aggr.max(e);
- c := calc.>(m,1);
+ c0 := calc.isnil(m);
+ c0 := calc.not(c0);
+ c1 := calc.>(m,1);
+ c1 := calc.and(c0,c1);
ms := calc.str(m);
msg := str.+("zero_or_one: cardinality violation (", ms);
msg := str.+(msg, ">1)");
- assert(c, msg);
+ assert(c1, msg);
return b;
end sql.zero_or_one;
@@ -3232,5 +3235,5 @@
return MAL_SUCCEED;
}
@c
-@:rnk(,nrank++,1)@
+@:rnk(,(void)c;nrank++,1)@
@:rnk(dense_,nrank+=(c?1:0),2)@
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
