Changeset: e25d6d7723b3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e25d6d7723b3
Modified Files:
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/server/sql_mvc.h
Branch: default
Log Message:
removed not used Tparse from mvc structure
diffs (43 lines):
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -2708,7 +2708,6 @@ backend_dumpproc(backend *be, Client c,
q = pushStr(mb, q, t);
GDKfree(tt);
q = pushStr(mb, q, getSQLoptimizer(be->mvc));
- m->Tparse = 0;
}
if (cq)
addQueryToCache(c);
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
@@ -781,7 +781,7 @@ SQLreader(Client c)
#endif
}
}
- if ( (c->stimeout && GDKusec()- c->session > c->stimeout) || !go ||
(strncmp(CURRENT(c), "\\q", 2) == 0)) {
+ if ( (c->stimeout && (GDKusec() - c->session) > c->stimeout) || !go ||
(strncmp(CURRENT(c), "\\q", 2) == 0)) {
in->pos = in->len; /* skip rest of the input */
c->mode = FINISHCLIENT;
return NULL;
@@ -982,8 +982,6 @@ SQLparser(Client c)
if (!m->sa)
m->sa = sa_create();
- if (m->history)
- be->mvc->Tparse = GDKusec();
m->emode = m_normal;
m->emod = mod_none;
if (be->language == 'X') {
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -113,7 +113,6 @@ typedef struct mvc {
int result_id;
res_table *results;
- lng Tparse;
} mvc;
extern int mvc_init(int debug, store_type store, int ro, int su, backend_stack
stk);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
