Changeset: 54858f81f090 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/54858f81f090
Modified Files:
clients/mapiclient/mclient.c
Branch: client_interrupts
Log Message:
Don't shadow variable names; only need to send abort on followup call.
diffs (26 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3219,15 +3219,17 @@ putfile(void *data, const char *filename
return flush < 0 ? "error writing output" : NULL;
}
if (state == INTERRUPT) {
- char *filename;
+ char *fname;
interrupted:
- filename = strdup(mnstr_name(priv->f));
+ fname = strdup(mnstr_name(priv->f));
close_stream(priv->f);
priv->f = NULL;
- if (filename) {
- MT_remove(filename);
- free(filename);
+ if (fname) {
+ MT_remove(fname);
+ free(fname);
}
+ if (filename == NULL)
+ (void) mapi_query_abort(mapi_get_active(priv->mid), 1);
return "query aborted";
}
if (mnstr_write(priv->f, buf, 1, bufsize) < (ssize_t) bufsize) {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
