MonetDB: default - Merge with Dec2011 branch.

[Sjoerd Mullender]

Changeset: fc2ce1cd50d3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc2ce1cd50d3
Modified Files:
        gdk/gdk_bbp.mx
        
sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql
Branch: default
Log Message:

Merge with Dec2011 branch.


diffs (51 lines):

diff --git a/gdk/gdk_bbp.mx b/gdk/gdk_bbp.mx
--- a/gdk/gdk_bbp.mx
+++ b/gdk/gdk_bbp.mx
@@ -2846,7 +2846,7 @@ typedef struct {
        bat bid;                /* bat id */
        BUN cnt;                /* bat count */
        int next;               /* next position in list */
-#if SIZEOF_SIZE_T == 8
+#if SIZEOF_OID == 8
        size_t dummy;           /* round up */
 #endif
 } bbptrim_t;
diff --git a/monetdb5/modules/atoms/url.mx b/monetdb5/modules/atoms/url.mx
--- a/monetdb5/modules/atoms/url.mx
+++ b/monetdb5/modules/atoms/url.mx
@@ -302,7 +302,8 @@ url_getContent(str *retval, /* put strin
 static str
 url_getContext(str *retval, url Str1)
 {
-       str s, d;
+       const char *s;
+       str d;
 
        if (Str1 == 0)
                throw(ILLARG, "url.getContext", "url missing");
@@ -315,11 +316,10 @@ url_getContext(str *retval, url Str1)
 
        s = strchr(s, '/');
        if (s == 0)
-               s= (str) str_nil;
-       d = GDKmalloc(strlen(Str1) - (s - Str1) + 1);
+               s = str_nil;
+       d = GDKstrdup(s);
        if (d == NULL)
                throw(MAL, "url.getContext", "Allocation failed");
-       strcpy(d, s);
        *retval = d;
        return MAL_SUCCEED;
 }
diff --git 
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql
 
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql
--- 
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql
+++ 
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql
@@ -2,6 +2,6 @@ create table t1234205 (name varchar(1024
 insert into t1234205 values ('niels'),('fabian'),('martin');
 
 prepare select name from t1234205 where name like ?;
-execute 1 ('%');
+exec ** ('%');
 prepare select name from t1234205 where name like 'n%';
-execute 2 ();
+exec ** ();
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list