MonetDB: default - Merge with Apr2012 branch.

[Stefan Manegold]

Changeset: 00e184300591 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00e184300591
Modified Files:
        sql/server/rel_psm.c
Branch: default
Log Message:

Merge with Apr2012 branch.


diffs (17 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
@@ -745,8 +745,12 @@ rel_create_func(mvc *sql, dlist *qname, 
                        }
                        if (!l)
                                l = sa_list(sql->sa);
-                       if (res)
+                       if (res) {
                                restype = result_type(sql, sf, fname, res);
+                               if (!restype)
+                                       return sql_error(sql, 01,
+                                                       "CREATE %s%s: failed to 
get restype", KF, F);
+                       }
 
                        if (body) {             /* sql func */
                                list *b = NULL;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list