Changeset: 92f7faad9e3a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92f7faad9e3a
Modified Files:
clients/R/MonetDB.R/R/dbi.R
monetdb5/mal/mal_errors.h
sql/server/rel_optimizer.c
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (35 lines):
diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R
--- a/clients/R/MonetDB.R/R/dbi.R
+++ b/clients/R/MonetDB.R/R/dbi.R
@@ -155,7 +155,7 @@ setMethod("dbDisconnect", "MonetDBConnec
setMethod("dbListTables", "MonetDBConnection", def=function(conn, ...,
sys_tables=F, schema_names=F) {
q <- "select schemas.name as sn, tables.name as tn from sys.tables join
sys.schemas on tables.schema_id=schemas.id"
- if (!sys_tables) q <- paste0(q, " where tables.system=false")
+ if (!sys_tables) q <- paste0(q, " where tables.system=false order by sn, tn")
df <- dbGetQuery(conn, q)
df$tn <- quoteIfNeeded(conn, df$tn, warn=F)
res <- df$tn
diff --git a/monetdb5/mal/mal_errors.h b/monetdb5/mal/mal_errors.h
--- a/monetdb5/mal/mal_errors.h
+++ b/monetdb5/mal/mal_errors.h
@@ -79,7 +79,6 @@
#define RUNTIME_STREAM_INPUT "Could not read from stream"
#define RUNTIME_LOAD_ERROR "Loading error"
-#define RUNTIME_LOAD_ERROR "Loading error"
#define RUNTIME_OBJECT_MISSING "Object not found"
#define RUNTIME_SIGNATURE_MISSING "The <module>.<function> not found"
#define RUNTIME_OBJECT_UNDEFINED "Object not found"
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
@@ -3521,7 +3521,7 @@ rel_push_select_down(int *changes, mvc *
ne = exp_push_down_prj(sql, e, r, pl);
/* can we move it down */
- if (ne && ne != e) {
+ if (ne && ne != e && pl->exps) {
rel_select_add_exp(sql->sa, pl, ne);
(*changes)++;
} else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
