MonetDB: default - Merge with Dec2011 branch.

[Sjoerd Mullender]

Changeset: 6f46d3f706cf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f46d3f706cf
Modified Files:
        monetdb5/mal/mal_type.c
Branch: default
Log Message:

Merge with Dec2011 branch.


diffs (27 lines):

diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -492,7 +492,7 @@ geom_export str mbrFromString(mbr **w, s
 str
 mbrFromString(mbr **w, str *src)
 {
-       int len = 0;
+       int len = *w ? (int) sizeof(mbr) : 0;
        char *errbuf;
        str ex;
 
diff --git a/monetdb5/mal/mal_type.c b/monetdb5/mal/mal_type.c
--- a/monetdb5/mal/mal_type.c
+++ b/monetdb5/mal/mal_type.c
@@ -204,9 +204,9 @@ getTypeIndex(str nme, int len, int defty
 }
 /*
  * @-
- * Literal constants are not necessary type specific, e.g.
+ * Literal constants are not necessarily type specific, e.g.
  * the value '0' could represent bte,sht,wrd,int,lng.
- * If the value is potential ambiguous then it should
+ * If the value is potentially ambiguous, it should
  * be made type specific in listings
  */
 int
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list