MonetDB: sciql - signature of rel_table() has been changed, but ...

[Jennie Zhang]

Changeset: e79c95bceaa1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e79c95bceaa1
Modified Files:
        sql/server/rel_schema.c
Branch: sciql
Log Message:

signature of rel_table() has been changed, but two calls to it ware not adapted 
(might have gone wrong during a merge action)


diffs (21 lines):

diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -839,7 +839,7 @@
                }
                temp = (tt == tt_table || tt == tt_array)?temp:SQL_PERSIST;
                /* TODO: need sth. special for arrays??? */
-               return rel_table(sql->sa, DDL_CREATE_TABLE, sname, t, temp);
+               return rel_table(sql, DDL_CREATE_TABLE, sname, t, temp);
        } else { /* [col name list] as subquery with or without data */
                sql_rel *sq = NULL, *res = NULL;
                dlist *as_sq = table_elements_or_subquery->data.lval;
@@ -861,7 +861,7 @@
 
                /* insert query result into this table */ /* TODO: handle 
create_array_as_subquery */
                temp = (tt == tt_table || tt == tt_array)?temp:SQL_PERSIST;
-               res = rel_table(sql->sa, DDL_CREATE_TABLE, sname, t, temp);
+               res = rel_table(sql, DDL_CREATE_TABLE, sname, t, temp);
                if (with_data) {
                        res = rel_insert(sql, res, sq);
                } else {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list