Changeset: 7f5841f411c6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f5841f411c6
Modified Files:
sql/server/rel_psm.c
Branch: sciql
Log Message:
(re-)applied changes of changeset d5b4b07da8b6 in sql/server/sql_psm.c to
sql/server/rel_psm.c
These changes accidentally got lost when incorrectly solving a merge conflict
that occurred after sql/server/sql_psm.c had been replaced by (renamed into?)
sql/server/rel_psm.c in the default branch.
diffs (12 lines):
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -597,7 +597,7 @@ result_type(mvc *sql, sql_subfunc *f, ch
{
if (res->token == SQL_TYPE) {
return &res->data.lval->h->data.typeval;
- } else if (res->token == SQL_TABLE) {
+ } else if (res->token == SQL_TABLE || res->token == SQL_ARRAY) {
/* here we create a new table-type */
sql_schema *sys = find_sql_schema(sql->session->tr, "sys");
sql_subtype *t = SA_NEW(sql->sa, sql_subtype);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
