Changeset: eab9b0cf9fb3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eab9b0cf9fb3
Modified Files:
sql/server/rel_schema.c
Branch: Jan2014
Log Message:
rel_create_index(): use idx_type instead of int
icc complained about
sql/server/rel_schema.c(1527): error #188: enumerated type mixed with another
type
i = mvc_create_idx(sql, nt, iname, itype);
^
hence, we change argument itype of function rel_create_index()
(the only place where mvc_create_idx() is called)
from int to idx_type,
and cast argument l->h->next->data.i_val to idx_type
when calling rel_create_index() in rel_schemas()
I hope this is correct and as intended;
Niels should double-check ...
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
@@ -1491,7 +1491,7 @@ rel_revoke_privs(mvc *sql, sql_schema *c
/* iname, itype, sname.tname (col1 .. coln) */
static sql_rel *
-rel_create_index(mvc *sql, char *iname, int itype, dlist *qname, dlist
*column_list)
+rel_create_index(mvc *sql, char *iname, idx_type itype, dlist *qname, dlist
*column_list)
{
sql_schema *s = NULL;
sql_table *t, *nt;
@@ -1723,7 +1723,7 @@ rel_schemas(mvc *sql, symbol *s)
dlist *l = s->data.lval;
assert(l->h->next->type == type_int);
- ret = rel_create_index(sql, l->h->data.sval,
l->h->next->data.i_val, l->h->next->next->data.lval,
l->h->next->next->next->data.lval);
+ ret = rel_create_index(sql, l->h->data.sval, (idx_type)
l->h->next->data.i_val, l->h->next->next->data.lval,
l->h->next->next->next->data.lval);
} break;
case SQL_DROP_INDEX: {
dlist *l = s->data.lval;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
