MonetDB: default - Merged from Mar2011

[Fabian Groffen]

Changeset: 54f3b827c9fc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=54f3b827c9fc
Modified Files:
        
Branch: default
Log Message:

Merged from Mar2011


diffs (62 lines):

diff --git a/debian/monetdb-client-testing.install 
b/debian/monetdb-client-testing.install
--- a/debian/monetdb-client-testing.install
+++ b/debian/monetdb-client-testing.install
@@ -1,4 +1,3 @@
-debian/tmp/usr/bin/odbcsample1 usr/bin
 debian/tmp/usr/bin/sample0 usr/bin
 debian/tmp/usr/bin/sample1 usr/bin
 debian/tmp/usr/bin/sample2 usr/bin
@@ -6,7 +5,6 @@
 debian/tmp/usr/bin/sample4 usr/bin
 debian/tmp/usr/bin/smack00 usr/bin
 debian/tmp/usr/bin/smack01 usr/bin
-debian/tmp/usr/bin/testgetinfo usr/bin
 debian/tmp/usr/bin/malsample.pl usr/bin
 debian/tmp/usr/bin/milsample.pl usr/bin
 debian/tmp/usr/bin/sqlsample.php usr/bin
diff --git a/monetdb5/modules/mal/mal_mapi.mx b/monetdb5/modules/mal/mal_mapi.mx
--- a/monetdb5/modules/mal/mal_mapi.mx
+++ b/monetdb5/modules/mal/mal_mapi.mx
@@ -258,7 +258,7 @@
 #include "mal_exception.h"
 #include "mal_interpreter.h"
 #include "mal_authorize.h"
-#include "mal_sabaoth.h"
+#include "msabaoth.h"
 #include <stream.h>
 
 #ifdef WIN32
@@ -626,7 +626,6 @@
 void SERVERannounce(struct in_addr addr, int port, str usockfile) {
        str buf;
        str host = NULL;
-       int ret = 0;
 
        if (port > 0) {
                if (addr.s_addr == INADDR_ANY) {
@@ -645,13 +644,21 @@
                                        (unsigned) ((ntohl(addr.s_addr) >> 8) & 
0xff),
                                        (unsigned) (ntohl(addr.s_addr) & 0xff));
                }
-               if ((buf = SABAOTHmarchConnection(&ret, &host, &port)) != 
MAL_SUCCEED && buf != M5OutOfMemory)
-                       GDKfree(buf);
+               if ((buf = msab_marchConnection(host, port)) != NULL)
+                       free(buf);
+               else 
+                       /* announce that we're now reachable */
+                       printf("# Listening for connection requests on "
+                                       "mapi:monetdb://%s:%i/\n", host, port);
        }
        if (usockfile != NULL) {
                port = 0;
-               if ((buf = SABAOTHmarchConnection(&ret, &usockfile, &port)) != 
MAL_SUCCEED && buf != M5OutOfMemory)
-                       GDKfree(buf);
+               if ((buf = msab_marchConnection(usockfile, port)) != NULL)
+                       free(buf);
+               else
+                       /* announce that we're now reachable */
+                       printf("# Listening for UNIX domain connection requests 
on "
+                                       "mapi:monetdb://%s\n", usockfile);
        }
 }
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list