Changeset: 3899334ca1f3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3899334ca1f3
Modified Files:
sql/server/rel_select.c
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (32 lines):
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
@@ -980,8 +980,8 @@ static char * rel_get_name( sql_rel *rel
if (rel->r)
return exp_name(rel->r);
return NULL;
- case op_basetable:
- return rel->r;
+ case op_basetable:
+ return NULL;
default:
if (rel->l)
return rel_get_name(rel->l);
@@ -4969,7 +4969,7 @@ join_on_column_name(mvc *sql, sql_rel *r
}
}
if (!found) {
- sql_error(sql, 02, "JOIN: no columns of tables '%s' and '%s'
match", rel_get_name(t1)?rel_get_name(t1):"",
rel_get_name(t2)?rel_get_name(t2):"");
+ sql_error(sql, 02, "JOIN: no columns of tables '%s' and '%s'
match", rel_name(t1)?rel_name(t1):"", rel_name(t2)?rel_name(t2):"");
rel_destroy(rel);
return NULL;
}
@@ -5497,7 +5497,7 @@ rel_joinquery_(mvc *sql, sql_rel *rel, s
sql_exp *rs = rel_bind_column(sql, t2, nm, sql_where);
if (!ls || !rs) {
- sql_error(sql, 02, "JOIN: tables '%s' and '%s'
do not have a matching column '%s'\n", rel_get_name(t1)?rel_get_name(t1):"",
rel_get_name(t2)?rel_get_name(t2):"", nm);
+ sql_error(sql, 02, "JOIN: tables '%s' and '%s'
do not have a matching column '%s'\n", rel_name(t1)?rel_name(t1):"",
rel_name(t2)?rel_name(t2):"", nm);
rel_destroy(rel);
return NULL;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
