Changeset: 7d004eb411b4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d004eb411b4
Modified Files:
sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err
sql/server/rel_select.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (28 lines):
diff --git a/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err
b/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err
--- a/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err
+++ b/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err
@@ -30,10 +30,9 @@ stderr of test 'crash.Bug-3609` in direc
# 22:37:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5645" "--port=33733"
# 22:37:46 >
-MAPI = (monetdb) /var/tmp/mtest-5645/.s.monetdb.33733
+MAPI = (monetdb) /var/tmp/mtest-30674/.s.monetdb.31568
QUERY = select generate_series(0,2,1);
-ERROR = !MALException:generate_series:internal error, generate_series is a
table producing function
- !program contains errors
+
# 22:37:46 >
# 22:37:46 > "Done."
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -3887,6 +3887,8 @@ rel_nop(mvc *sql, sql_rel **rel, symbol
node *n, *m;
list *nexps;
+ if (f->func->type != type)
+ return sql_error(sql, 02, "SELECT: no such operator
'%s'", fname);
if (f->func->vararg)
return exp_op(sql->sa, exps, f);
nexps = new_exp_list(sql->sa);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
