Changeset: fbb8f4640296 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fbb8f4640296
Modified Files:
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_scenario.c
Branch: default
Log Message:
No more exception_buf.
diffs (49 lines):
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -253,7 +253,6 @@ MCinitClientRecord(Client c, oid user, b
c->promptlength = strlen(prompt);
c->actions = 0;
- c->exception_buf_initialized = 0;
c->error_row = c->error_fld = c->error_msg = c->error_input = NULL;
c->wlc_kind = 0;
c->wlc = NULL;
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -152,9 +152,6 @@ typedef struct CLIENT {
*/
int actions;
- jmp_buf exception_buf;
- int exception_buf_initialized;
-
/*
* Here are pointers to scenario backends contexts. For the time
* being just SQL. We need a pointer for each of them, since they
diff --git a/monetdb5/mal/mal_scenario.c b/monetdb5/mal/mal_scenario.c
--- a/monetdb5/mal/mal_scenario.c
+++ b/monetdb5/mal/mal_scenario.c
@@ -526,12 +526,8 @@ runPhase(Client c, int phase)
static str
runScenarioBody(Client c, int once)
{
- str msg;
+ str msg = MAL_SUCCEED;
- c->exception_buf_initialized = 1;
- if (setjmp( c->exception_buf) < 0)
- c->mode = FINISHCLIENT;
- msg = MAL_SUCCEED;
while (c->mode > FINISHCLIENT && !GDKexiting()) {
// be aware that a MAL call may initialize a different scenario
if ( !c->state[0] && (msg = runPhase(c,
MAL_SCENARIO_INITCLIENT)) )
@@ -564,7 +560,6 @@ runScenarioBody(Client c, int once)
c->actions++;
if( once) break;
}
- c->exception_buf_initialized = 0;
if (once == 0)
msg = runPhase(c, MAL_SCENARIO_EXITCLIENT);
return msg;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
