Changeset: 2807b3b6063b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2807b3b6063b
Modified Files:
gdk/gdk_utils.c
sql/backends/monet5/sql.c
Branch: resource_management
Log Message:
fix sanitizer error
diffs (39 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -2395,15 +2395,15 @@ sa_close( allocator *sa )
{
assert(sa->tmp_active);
sa->tmp_active = 0;
- //sa_reset(sa);
- while (sa->tmp_used) {
- assert(sa->used >= sa->tmp_used);
- if (sa->used >= sa->tmp_used) {
- sa->used -= sa->tmp_used;
- sa->usedmem -= sa->tmp_used;
- sa->tmp_used = 0;
- }
- }
+ sa_reset(sa);
+ //while (sa->tmp_used) {
+ // assert(sa->used >= sa->tmp_used);
+ // if (sa->used >= sa->tmp_used) {
+ // sa->used -= sa->tmp_used;
+ // sa->usedmem -= sa->tmp_used;
+ // sa->tmp_used = 0;
+ // }
+ //}
}
void
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -193,6 +193,7 @@ sqlcleanup(backend *be, int err)
be->mvc->label = 0;
be->mvc->nid = 1;
be->no_mitosis = 0;
+ be->client->query = NULL;
scanner_query_processed(&(be->mvc->scanner));
return err;
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
