MonetDB: default - Merge with Apr2011 branch.

[Sjoerd Mullender]

Changeset: 4ffc389c7265 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ffc389c7265
Modified Files:
        sql/backends/monet5/sql.mx
Branch: default
Log Message:

Merge with Apr2011 branch.


diffs (32 lines):

diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -1129,13 +1129,11 @@
        GEOSGeom_destroy(geosGeometry);
 
 #if @6
-       if (*out != @5)
-#else
-       if (1 == 1) /* trick compiler for the throw after this return */
+       if (*out == @5)
+               throw(MAL, "geom.@1", "@3 failed");
 #endif
-               return MAL_SUCCEED;
+       return MAL_SUCCEED;
 
-       throw(MAL, "geom.@1", "@3 failed");
 }
 @c
 @:basic(Dimension,int,GEOSGeom_getDimensions,,0,1)@
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -233,7 +233,7 @@
 address mvc_clear_table_wrap
 comment "Clear table";
 
-pattern delete(mvc:int, sname:str, tname:str, b:any):int 
+pattern delete{unsafe}(mvc:int, sname:str, tname:str, b:any):int
 address mvc_delete_wrap
 comment "delete from table";
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list