Changeset: c536a144d287 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c536a144d287
Branch: tvtree
Log Message:
Merges nested branch
diffs (21 lines):
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
@@ -2202,6 +2202,8 @@ FINDsep(char *s, char tsep, char rsep)
break;
}
}
+ if (!*s)
+ return NULL;
return s;
}
@@ -2265,7 +2267,7 @@ TUPLEparser(char **S, Column *cols, int
msg = VALUEparser(&s, cols, i, &f->type, ',', ')');
i++;
}
- if (n->next) {
+ if (!msg && n->next) {
skipspace(s);
if (!s && *s && s[0] != ',')
throw(SQL, "SQLfrom_varchar", SQLSTATE(42000)
"missing , within composite value");
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
