MonetDB: Apr2012 - Merge with Dec2011 branch.

[Sjoerd Mullender]

Changeset: ce53a5353ce5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce53a5353ce5
Modified Files:
        clients/mapiclient/dump.c
Branch: Apr2012
Log Message:

Merge with Dec2011 branch.


diffs (14 lines):

diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -424,7 +424,9 @@ dump_type(Mapi mid, stream *toConsole, c
                        space = mnstr_printf(toConsole, "INTERVAL SECOND");
                else
                        fprintf(stderr, "Internal error: unrecognized second 
interval %s\n", c_type_digits);
-       } else if (strcmp(c_type, "clob") == 0) {
+       } else if (strcmp(c_type, "clob") == 0 ||
+                  (strcmp(c_type, "varchar") == 0 &&
+                   strcmp(c_type_digits, "0") == 0)) {
                space = mnstr_printf(toConsole, "CHARACTER LARGE OBJECT");
                if (strcmp(c_type_digits, "0") != 0)
                        space += mnstr_printf(toConsole, "(%s)", c_type_digits);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list