MonetDB: default - merging from Feb2013

[Niels Nes]

Changeset: 2ba87617bc7c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ba87617bc7c
Modified Files:
        sql/backends/monet5/sql_optimizer.c
Branch: default
Log Message:

merging from Feb2013


diffs (22 lines):

diff --git a/sql/backends/monet5/sql_optimizer.c 
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -130,7 +130,8 @@ SQLgetStatistics(Client cntxt, mvc *m, M
                                size_t cnt;
                                sql_idx *i = mvc_bind_idx(m, s, cname);
 
-                               if (i && !isRemote(i->t)) { /* skip alter and 
remote statements */
+                               /* skip alter on remote statements */
+                               if (i && (!isRemote(i->t) && 
!isMergeTable(i->t))) {
                                        cnt = store_funcs.count_idx(i, 1);
                                        assert(cnt <= (size_t) GDK_oid_max);
                                        b = 
store_funcs.bind_idx(m->session->tr,i,0);
@@ -148,7 +149,7 @@ SQLgetStatistics(Client cntxt, mvc *m, M
                                sql_table *t = mvc_bind_table(m, s, tname);
                                sql_column *c = mvc_bind_column(m, t, cname);
 
-                               if (c && !isRemote(c->t)) {
+                               if (c && (!isRemote(c->t) && 
!isMergeTable(c->t))) {
                                        not_null = !c->null;
 
                                        cnt = store_funcs.count_col(c, 1);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list