Changeset: 4a6c284388e7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a6c284388e7
Modified Files:
clients/src/mapilib/Mapi.mx
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (44 lines):
diff -r 89ae0028edaf -r 4a6c284388e7 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Wed Dec 01 18:49:08 2010 +0100
+++ b/clients/src/mapilib/Mapi.mx Wed Dec 01 18:50:24 2010 +0100
@@ -4025,14 +4025,14 @@
if (line == NULL)
return mid->error;
switch (*line) {
- case PROMPTBEG:
+ case PROMPTBEG: /* \001 */
mid->active = NULL;
hdl->active = NULL;
/* set needmore flag if line equals PROMPT2 up
to newline */
- copy = PROMPT2;
+ copy = PROMPT2; /* \001\002\n */
while (*line) {
- if (*line != *copy)
+ if (*line != *copy) /* must be EOF or PROMPT1
\001\001\n */
return mid->error;
line++;
copy++;
@@ -4050,9 +4050,10 @@
yet (duh!), or if we've already seen
normal output for the current one */
if (result == NULL ||
- result->cache.writer > 0 ||
- result->querytype == Q_TABLE ||
- result->querytype == Q_UPDATE) {
+ result->cache.writer > 0 ||
+ result->querytype == Q_TABLE ||
+ result->querytype == Q_UPDATE)
+ {
result = new_result(hdl);
hdl->active = result;
}
@@ -4077,7 +4078,7 @@
}
add_cache(result, strdup(line), !lookahead);
if (lookahead > 0 &&
- (result->querytype == -1/* unknown (not SQL) */ ||
+ (result->querytype == -1 /* unknown (not SQL) */ ||
result->querytype == Q_TABLE ||
result->querytype == Q_UPDATE))
return mid->error;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
