Changeset: 50cdc004c38f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50cdc004c38f Modified Files: sql/src/server/rel_bin.c Branch: default Log Message:
Merge with Oct2010 branch. diffs (40 lines): diff -r 4132a3fae9cc -r 50cdc004c38f MonetDB5/src/optimizer/Tests/tst4701.stable.out --- a/MonetDB5/src/optimizer/Tests/tst4701.stable.out Thu Oct 07 19:13:08 2010 +0200 +++ b/MonetDB5/src/optimizer/Tests/tst4701.stable.out Fri Oct 08 09:56:03 2010 +0200 @@ -13,6 +13,7 @@ # Visit http://monetdb.cwi.nl/ for further information # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32804/ command user.tst903():void address MCCAdmin_tst903; +!TypeException:user.main[2]:Object code missing !TypeException:user.main[2]:'user.tst903' undefined in: _2:void := user.tst903() function user.main():void; # after the routine tst903 is it can be linked diff -r 4132a3fae9cc -r 50cdc004c38f sql/src/server/rel_bin.c --- a/sql/src/server/rel_bin.c Thu Oct 07 19:13:08 2010 +0200 +++ b/sql/src/server/rel_bin.c Fri Oct 08 09:56:03 2010 +0200 @@ -3858,8 +3858,12 @@ { node *n; list *refs = list_create(NULL); + int sqltype = sql->type; stmt *s = subrel_bin( sql, rel, refs); + if (sqltype == Q_SCHEMA) + sql->type = sqltype; /* reset */ + /* clean stmts properly (but don't touch the rels) ! */ for (n = refs->h; n; n = n->next->next) stmt_destroy(n->next->data); @@ -3877,8 +3881,12 @@ output_rel_bin(mvc *sql, sql_rel *rel ) { list *refs = list_create(NULL); + int sqltype = sql->type; stmt *s = subrel_bin( sql, rel, refs); + if (sqltype == Q_SCHEMA) + sql->type = sqltype; /* reset */ + if (!is_ddl(rel->op) && s && s->type != st_none && sql->type == Q_TABLE) s = stmt_output(s); list_destroy(refs); _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
