Changeset: b758fc7496b8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b758fc7496b8
Modified Files:
monetdb5/modules/mal/tablet.c
sql/backends/monet5/sql.c
sql/backends/monet5/vaults/bam/bam_lib.c
sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.stable.err
Branch: Jun2016
Log Message:
Memory leaks.
diffs (58 lines):
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1296,7 +1296,6 @@ SQLproducer(void *p)
char msg[256];
snprintf(msg, sizeof(msg), "incomplete record
at end of file:%s\n", s);
tablet_error(task, lng_nil, int_nil,
"incomplete record at end of file", s);
- task->as->error = GDKstrdup(msg);
task->b->pos += partial;
}
goto reportlackofinput;
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
@@ -2874,7 +2874,7 @@ mvc_export_table_wrap( Client cntxt, Mal
if (mvc_export_result(cntxt->sqlcontext, s, res))
msg = createException(SQL, "sql.resultset", "failed");
if( s != cntxt->fdout)
- mnstr_close(s);
+ close_stream(s);
wrapup_result_set1:
BBPunfix(order->batCacheid);
if( tbl) BBPunfix(tblId);
diff --git a/sql/backends/monet5/vaults/bam/bam_lib.c
b/sql/backends/monet5/vaults/bam/bam_lib.c
--- a/sql/backends/monet5/vaults/bam/bam_lib.c
+++ b/sql/backends/monet5/vaults/bam/bam_lib.c
@@ -475,6 +475,7 @@ seq_char_bat(bat * ret, int * ref_pos, b
goto cleanup;
}
BUNappend(result, (ptr) r, FALSE);
+ GDKfree(r);
++seq;
++pos;
++cigar;
diff --git
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
---
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
+++
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
@@ -88,7 +88,7 @@ QUERY = COPY 1 RECORDS INTO "news" FROM
allemaal nogal lang duurt, maar in principe is het nog
maar een uurtje of 6 werk om het goed te krijgen. Zoals
je kan zien heb ik bij de voicemails al wat leuke
-ERROR = !Failed to import table incomplete record at end of file:
+ERROR = !Failed to import table incomplete record at end of file
diff --git
a/sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.stable.err
b/sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.stable.err
--- a/sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.stable.err
+++ b/sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.stable.err
@@ -32,7 +32,7 @@ stderr of test 'malformed-copy-int.Bug-3
MAPI = (monetdb) /var/tmp/mtest-25832/.s.monetdb.32759
QUERY = COPY INTO test3987 FROM
'/net/madrid/export/scratch1/sjoerd/src/MonetDB/stable/sql/test/BugTracker-2016/Tests/data3987.csv'
DELIMITERS '\t','\n','\"' NULL AS '<NULL>';
-ERROR = !Failed to import table incomplete record at end of file:
+ERROR = !Failed to import table incomplete record at end of file
# 14:57:00 >
# 14:57:00 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
