Changeset: 3d69aa764efa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d69aa764efa
Modified Files:
monetdb5/modules/mal/tablet.c
Branch: default
Log Message:
Revert incorrect fix that should have been fixed (and was) in another branch.
The base pointers are checked when they are allocated, so no need to
do that again.
Backed out changeset 5623be6a5417
diffs (21 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
@@ -1629,16 +1629,7 @@ SQLload_file(Client cntxt, Tablet *as, b
else
task->maxrow = (BUN) maxrow;
- /* task->base is always allocated since it is part of the task struct.
- * However, the arrays assigned within may be zero if GDKzalloc
failed.*/
- for (i = 0; i < MAXBUFFERS; i++) {
- if (task->base[i] == NULL) {
- tablet_error(task, lng_nil, int_nil, NULL,
"SQLload_file");
- goto bailout;
- }
- }
-
- if (task->fields == 0 || task->cols == 0 || task->time == 0) {
+ if (task->fields == 0 || task->cols == 0 || task->time == 0 ||
task->base == 0) {
tablet_error(task, lng_nil, int_nil, NULL, "SQLload_file");
goto bailout;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
