Changeset: 16293da28abc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/16293da28abc
Modified Files:
sql/server/rel_psm.c
sql/server/rel_schema.c
Branch: Jul2021
Log Message:
My bad, on these places, it should never conflict
diffs (46 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
@@ -990,8 +990,7 @@ rel_create_func(sql_query *query, dlist
sql->params = NULL;
if (create) {
- if (!(f = mvc_create_func(sql, sql->sa, s,
fname, l, restype, type, lang, mod, fname, lang_body, (type ==
F_LOADER)?TRUE:FALSE, vararg, FALSE)))
- return sql_error(sql, 01,
SQLSTATE(42000) "CREATE %s: transaction conflict detected", F);
+ f = mvc_create_func(sql, sql->sa, s, fname, l,
restype, type, lang, mod, fname, lang_body, (type == F_LOADER)?TRUE:FALSE,
vararg, FALSE);
} else if (!sf) {
return sql_error(sql, 01, SQLSTATE(42000)
"CREATE %s: %s function %s.%s not bound", F, slang, s->base.name, fname);
}
@@ -1002,8 +1001,7 @@ rel_create_func(sql_query *query, dlist
if (create) { /* needed for recursive functions */
q = query_cleaned(sql->ta, q);
- if (!(sql->forward = f = mvc_create_func(sql,
sql->sa, s, fname, l, restype, type, lang, sql_shared_module_name, q, q, FALSE,
vararg, FALSE)))
- return sql_error(sql, 01,
SQLSTATE(42000) "CREATE %s: transaction conflict detected", F);
+ sql->forward = f = mvc_create_func(sql,
sql->sa, s, fname, l, restype, type, lang, sql_shared_module_name, q, q, FALSE,
vararg, FALSE);
}
sql->session->schema = s;
b = sequential_block(query, (ra)?&ra->type:NULL,
ra?NULL:restype, body, NULL, is_func);
@@ -1031,8 +1029,7 @@ rel_create_func(sql_query *query, dlist
sql->params = NULL;
if (create) {
q = query_cleaned(sql->ta, q);
- if (!(f = mvc_create_func(sql, sql->sa, s,
fname, l, restype, type, lang, fmod, fnme, q, FALSE, vararg, FALSE)))
- return sql_error(sql, 01,
SQLSTATE(42000) "CREATE %s: transaction conflict detected", F);
+ f = mvc_create_func(sql, sql->sa, s, fname, l,
restype, type, lang, fmod, fnme, q, FALSE, vararg, FALSE);
} else if (!sf) {
return sql_error(sql, 01, SQLSTATE(42000)
"CREATE %s: external name %s.%s not bound (%s.%s)", F, fmod, fnme,
s->base.name, fname );
} else {
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
@@ -1944,8 +1944,7 @@ rel_create_index(mvc *sql, char *iname,
sname = t->s->base.name;
/* add index here */
- if (!(i = mvc_create_idx(sql, nt, iname, itype)))
- return sql_error(sql, 02, SQLSTATE(42000) "CREATE INDEX:
transaction conflict detected");
+ i = mvc_create_idx(sql, nt, iname, itype);
i->base.new = 1;
for (n = column_list->h; n; n = n->next) {
sql_column *c = mvc_bind_column(sql, nt, n->data.sval);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
