Changeset: 84f723f75637 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84f723f75637
Modified Files:
Branch: default
Log Message:
Merged heads.
diffs (29 lines):
diff -r bade9880d595 -r 84f723f75637 MonetDB5/src/mal/mal_function.mx
--- a/MonetDB5/src/mal/mal_function.mx Wed May 19 16:04:25 2010 +0200
+++ b/MonetDB5/src/mal/mal_function.mx Wed May 19 16:06:03 2010 +0200
@@ -72,7 +72,6 @@
/* #define DEBUG_CLONE */
mal_export Symbol newFunction(str mod, str nme,int kind);
-mal_export void clearFcn(MalBlkPtr m);
mal_export int getPC(MalBlkPtr mb, InstrPtr p);
mal_export InstrPtr newCall(Module scope, str fcnname, int kind);
diff -r bade9880d595 -r 84f723f75637 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Wed May 19 16:04:25 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Wed May 19 16:06:03 2010 +0200
@@ -2170,8 +2170,13 @@
free(mid->hostname);
mid->hostname = host ? strdup(host) : NULL;
- if (port == 0)
+ if (port == 0) {
port = 50000; /* hardwired default */
+ } else {
+ /* make sure we won't search for a unix socket first */
+ if (mid->hostname == NULL)
+ mid->hostname = strdup("localhost");
+ }
/* fill some defaults for user/pass, this should actually never happen
*/
if (username == NULL)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
