Changeset: 90dc1204adc3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90dc1204adc3 Modified Files: sql/server/rel_dump.c sql/server/rel_optimizer.c Branch: graph0 Log Message:
Build fix: resolve the errors from the merge with nested_table that broke the build diffs (30 lines): diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c --- a/sql/server/rel_dump.c +++ b/sql/server/rel_dump.c @@ -64,8 +64,6 @@ cmp_print(mvc *sql, stream *fout, int cm mnstr_printf(fout, " %s ", r); } -static void exps_print(mvc *sql, stream *fout, list *exps, int depth, int alias, int brackets); - static void exp_print(mvc *sql, stream *fout, sql_exp *e, int depth, int comma, int alias) { diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c --- a/sql/server/rel_optimizer.c +++ b/sql/server/rel_optimizer.c @@ -7165,14 +7165,6 @@ rel_simplify_predicates(int *changes, mv static void split_exps(mvc *sql, list *exps, sql_rel *rel); static int -exp_match_exp_cmp( sql_exp *e1, sql_exp *e2) -{ - if (exp_match_exp(e1,e2)) - return 0; - return -1; -} - -static int exp_refers_cmp( sql_exp *e1, sql_exp *e2) { if (exp_refers(e1,e2)) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list