MonetDB: Jun2010 - merge fix

[Niels Nes]

Changeset: b7e647657aca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7e647657aca
Modified Files:
        sql/src/server/rel_schema.mx
Branch: Jun2010
Log Message:

merge fix


diffs (12 lines):

diff -r 163c8b7a2e71 -r b7e647657aca sql/src/server/rel_schema.mx
--- a/sql/src/server/rel_schema.mx      Fri May 21 12:57:19 2010 +0200
+++ b/sql/src/server/rel_schema.mx      Fri May 21 21:38:57 2010 +0200
@@ -685,6 +685,8 @@
                sql_table *ot = mvc_bind_table(sql, ss, name);
                node *n;
 
+               if (!ot)
+                       return SQL_ERR;
                for (n = ot->columns.set->h; n; n = n->next) {
                        sql_column *oc = n->data;
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list