Changeset: 925dd2dfe849 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/925dd2dfe849
Modified Files:
sql/backends/monet5/sql_scenario.c
Branch: Jan2022
Log Message:
merged with jul2021
diffs (28 lines):
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1016,12 +1016,12 @@ SQLparser(Client c)
if (n == 2 || n == 3) {
if (n == 2)
len = m->reply_size;
+ in->pos = in->len; /* HACK: should use parsed
length */
if ((ok = mvc_export_chunk(be, out, v, off, len < 0 ?
BUN_NONE : (BUN) len)) < 0) {
msg = createException(SQL, "SQLparser",
SQLSTATE(45000) "Result set construction failed: %s", mvc_export_error(be, out,
ok));
goto finalize;
}
- in->pos = in->len; /* HACK: should use parsed
length */
return MAL_SUCCEED;
}
if (strncmp(in->buf + in->pos, "close ", 6) == 0) {
@@ -1088,8 +1088,10 @@ SQLparser(Client c)
}
if (strncmp(in->buf + in->pos, "quit", 4) == 0) {
c->mode = FINISHCLIENT;
+ in->pos = in->len; /* HACK: should use parsed
length */
return MAL_SUCCEED;
}
+ in->pos = in->len; /* HACK: should use parsed length */
msg = createException(SQL, "SQLparser", SQLSTATE(42000)
"Unrecognized X command: %s\n", in->buf + in->pos);
goto finalize;
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
