MonetDB: headless - Merge with default branch.

[Sjoerd Mullender]

Changeset: 397f4e2b7bce for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=397f4e2b7bce
Modified Files:
        
Branch: headless
Log Message:

Merge with default branch.


diffs (49 lines):

diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -838,7 +838,6 @@
 #ifndef INVALID_SOCKET
 #define INVALID_SOCKET (-1)
 #endif
- */
 
 #define MAPIBLKSIZE    256     /* minimum buffer shipped */
 
@@ -1174,7 +1173,7 @@
                if (mid->hostname[0] == '/')
                        fprintf(fd, "MAPI  = (%s) %s\n", mid->username, 
mid->hostname);
                else
-                       fprintf(fd, "MAPI  = %s\@%s:%d\n",
+                       fprintf(fd, "MAPI  = %s@%s:%d\n",
                                mid->username, mid->hostname, mid->port);
                if (mid->action)
                        fprintf(fd, "ACTION= %s\n", mid->action);
@@ -1200,7 +1199,7 @@
                if (mid->hostname[0] == '/')
                        fprintf(fd, "MAPI  = (%s) %s\n", mid->username, 
mid->hostname);
                else
-                       fprintf(fd, "MAPI  = %s\@%s:%d\n",
+                       fprintf(fd, "MAPI  = %s@%s:%d\n",
                                mid->username, mid->hostname, mid->port);
                if (mid->action)
                        fprintf(fd, "ACTION= %s\n", mid->action);
@@ -1234,7 +1233,7 @@
                if (mid->hostname[0] == '/')
                        fprintf(fd, "MAPI  = (%s) %s\n", mid->username, 
mid->hostname);
                else
-                       fprintf(fd, "MAPI  = %s\@%s:%d\n",
+                       fprintf(fd, "MAPI  = %s@%s:%d\n",
                                mid->username, mid->hostname, mid->port);
                if (mid->action)
                        fprintf(fd, "ACTION= %s\n", mid->action);
diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h
--- a/clients/mapilib/mapi.h
+++ b/clients/mapilib/mapi.h
@@ -73,6 +73,7 @@
  * The type of both the 'param' and 'binding'
  * variables refer to their underlying C-type. They are used for
  * automatic type coercion between back-end and application.
+ */
 typedef struct MapiStruct *Mapi;
 
 /* this definition is a straight copy from sql/include/sql_query.h */
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list