Changeset: 740570eebfc4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/740570eebfc4
Modified Files:
sql/backends/monet5/sql_scenario.c
Branch: triggers
Log Message:
fixed merge problem
diffs (15 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
@@ -376,9 +376,8 @@ SQLprepareClient(Client c, str passwd, s
default:
break;
}
- lng maxmem;
- if (monet5_user_get_max_memory(m, m->user_id, &maxmem) == 0) {
- c->qryctx.maxmem = (ATOMIC_BASE_TYPE) (maxmem > 0 ?
maxmem : 0);
+ if (monet5_user_get_limits(m, m->user_id, &c->maxmem,
&c->maxworkers) == 0) {
+ c->qryctx.maxmem = (ATOMIC_BASE_TYPE) (c->maxmem > 0 ?
c->maxmem : 0);
} else {
c->maxmem = 0;
c->qryctx.maxmem = 0;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
