MonetDB: default - Merge with Oct2020 branch.

[Sjoerd Mullender]

Changeset: e7c174562b1d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e7c174562b1d
Modified Files:
        monetdb5/modules/mal/tablet.c
Branch: default
Log Message:

Merge with Oct2020 branch.


diffs (17 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
@@ -1091,8 +1091,12 @@ SQLworker(void *arg)
                                        if (SQLload_parse_line(task, j) < 0) {
                                                task->errorcnt++;
                                                // early break unless best 
effort
-                                               if (!task->besteffort)
+                                               if (!task->besteffort) {
+                                                       for (j++; j < 
task->top[task->cur] && j < piece * (task->id +1); j++)
+                                                               for (i = 0; i < 
task->as->nr_attrs; i++)
+                                                                       
task->fields[i][j] = NULL;
                                                        break;
+                                               }
                                        }
                                }
                        task->wtime = GDKusec() - t0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list