MonetDB: Jun2010 - Return a correct URI for local connection fro...

[Fabian Groffen]

Changeset: 2a62d1933339 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a62d1933339
Modified Files:
        MonetDB5/ChangeLog.Jun2010
        MonetDB5/src/mal/mal_sabaoth.mx
Branch: Jun2010
Log Message:

Return a correct URI for local connection from Sabaoth when the connection is a 
UNIX domain socket.  Partial fix for bug #2567.


diffs (32 lines):

diff -r 2d856b72dba7 -r 2a62d1933339 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010        Thu Jul 01 14:01:29 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010        Thu Jul 01 14:30:44 2010 +0200
@@ -1,6 +1,10 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Thr Jul 01 2010 Fabian Groffen <fab...@cwi.nl>
+- Return a correct URI for local connection from Sabaoth when the
+  connection is a UNIX domain socket.  Partial fix for bug #2567.
+
 * Wed Jun 30 2010 Stefan Manegold <stefan.maneg...@cwi.nl>
 - various performance fixes in grouping and grouped aggregation code
   (MonetDB5/src/modules/kernel/group.mx, MonetDB5/src/modules/kernel/aggr*.mx)
diff -r 2d856b72dba7 -r 2a62d1933339 MonetDB5/src/mal/mal_sabaoth.mx
--- a/MonetDB5/src/mal/mal_sabaoth.mx   Thu Jul 01 14:01:29 2010 +0200
+++ b/MonetDB5/src/mal/mal_sabaoth.mx   Thu Jul 01 14:30:44 2010 +0200
@@ -349,7 +349,13 @@
        if (stats == NULL || stats->conns == NULL || stats->conns->val == NULL) 
{
                *ret = GDKstrdup(str_nil);
        } else {
-               snprintf(data, sizeof(data), "%s%s", stats->conns->val, 
stats->dbname);
+               if (stats->conns->val[15] == '/') {
+                       snprintf(data, sizeof(data), "%s?database=%s",
+                                       stats->conns->val, stats->dbname);
+               } else {
+                       snprintf(data, sizeof(data), "%s%s",
+                                       stats->conns->val, stats->dbname);
+               }
                *ret = GDKstrdup(data);
        }
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list