MonetDB: default - Merge with Aug2011 branch.

[Sjoerd Mullender]

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

Merge with Aug2011 branch.


diffs (37 lines):

diff --git a/clients/mapiclient/mnc.c b/clients/mapiclient/mnc.c
--- a/clients/mapiclient/mnc.c
+++ b/clients/mapiclient/mnc.c
@@ -88,9 +88,9 @@
        char *host = NULL;
        int port = 0;
        char clisten = 0;
-       char udp = 0;
-       char zip = 0;
-       char buffer = 0;
+       /* char udp = 0; */
+       /* char zip = 0; */
+       /* char buffer = 0; */
        char block = 0;
        SOCKET s = INVALID_SOCKET;
        stream *in = NULL;
@@ -120,16 +120,16 @@
                                clisten = 1;
                                break;
                        case 'u':
-                               udp = 1;
+                               /* udp = 1; */
                                break;
                        case 'g':
-                               zip = 1;
+                               /* zip = 1; */
                                break;
                        case 'j':
-                               zip = 2;
+                               /* zip = 2; */
                                break;
                        case 'b':
-                               buffer = 1;
+                               /* buffer = 1; */
                                break;
                        case 'B':
                                block = 1;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list