MonetDB: default - Merge with Apr2011 branch.

[Sjoerd Mullender]

Changeset: e7e57dd2406a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e7e57dd2406a
Modified Files:
        geom/monetdb5/50_geom.mal
Branch: default
Log Message:

Merge with Apr2011 branch.


diffs (83 lines):

diff --git a/geom/monetdb5/50_geom.mal b/geom/monetdb5/30_geom.mal
rename from geom/monetdb5/50_geom.mal
rename to geom/monetdb5/30_geom.mal
diff --git a/geom/monetdb5/Makefile.ag b/geom/monetdb5/Makefile.ag
--- a/geom/monetdb5/Makefile.ag
+++ b/geom/monetdb5/Makefile.ag
@@ -49,7 +49,7 @@
 headers_autoload = {
        HEADERS = mal
        DIR = libdir/monetdb5/autoload
-       SOURCES = 50_geom.mal
+       SOURCES = 30_geom.mal
 }
 
-EXTRA_DIST = 50_geom.mal
+EXTRA_DIST = 30_geom.mal
diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -629,8 +629,8 @@
 )
 {
        GEOSGeom geosGeometry = NULL; /* The geometry object that is parsed 
from the src string. */
-       unsigned char* wkb = NULL; /* The "well known binary" serialization of 
the geometry object. */
-       size_t wkbLen = 0; /* The length of the wkb string. */
+       unsigned char* wkbSer = NULL; /* The "well known binary" serialization 
of the geometry object. */
+       size_t wkbLen = 0; /* The length of the wkbSer string. */
        int nil = 0;
 
        if (strcmp(src, str_nil) == 0) 
@@ -646,20 +646,20 @@
        }
 
        if (!nil) {
-               wkb = GEOSGeomToWKB_buf(geosGeometry, &wkbLen);
+               wkbSer = GEOSGeomToWKB_buf(geosGeometry, &wkbLen);
                GEOSGeom_destroy(geosGeometry);
        }
        if (*len < (int)wkb_size(wkbLen)) {
                if (*atom) GDKfree(*atom);
                *atom = GDKmalloc(*len = (int)wkb_size(wkbLen));
        }
-       if (!wkb) {
+       if (!wkbSer) {
                **atom = *wkbNULL();
        } else {
                assert(wkbLen <= GDK_int_max);
                (*atom)->len = (int) wkbLen;
-               memcpy(&(*atom)->data, wkb, wkbLen);
-               free(wkb);
+               memcpy(&(*atom)->data, wkbSer, wkbLen);
+               free(wkbSer);
        }
        wkbLen = strlen(src);
        assert(wkbLen <= GDK_int_max);
diff --git a/tools/merovingian/daemon/merovingian.c 
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -216,8 +216,13 @@
 
                pthread_mutex_unlock(&_mero_topdp_lock);
                
-               if (select(nfds + 1, &readfds, NULL, NULL, &tv) <= 0)
-                       continue;
+               if (select(nfds + 1, &readfds, NULL, NULL, &tv) <= 0) {
+                       if (_mero_keep_logging != 0) {
+                               continue;
+                       } else {
+                               break;
+                       }
+               }
 
                pthread_mutex_lock(&_mero_topdp_lock);
 
@@ -235,7 +240,7 @@
                pthread_mutex_unlock(&_mero_topdp_lock);
 
                fflush(_mero_logfile);
-       } while (_mero_keep_logging != 0);
+       } while (1);
 }
 
 /**
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list