Changeset: c0c45c43c8d0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0c45c43c8d0
Modified Files:
monetdb5/modules/mal/tablet.c
sql/backends/monet5/sql_result.c
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (24 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
@@ -1256,7 +1256,7 @@ SQLproducer(void *p)
base = end = s = task->input[cur];
*s = 0;
task->cur = cur;
- if (task->b == task->cntxt->fdin) {
+ if (task->as->filename == NULL) {
consoleinput = 1;
goto parseSTDIN;
}
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -805,7 +805,7 @@ mvc_import_table(Client cntxt, BAT ***ba
as.error = NULL;
as.tryall = 0;
as.complaints = NULL;
- as.filename = "";
+ as.filename = m->scanner.rs == bs ? NULL : "";
fmt = as.format = (Column *) GDKzalloc(sizeof(Column) *
(as.nr_attrs + 1));
if (fmt == NULL) {
sql_error(m, 500, "failed to allocate memory ");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
