MonetDB: default - fix compilation

[Niels Nes]

Changeset: 47e769635930 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47e769635930
Modified Files:
        sql/backends/monet5/sql_gencode.c
        sql/storage/store.c
Branch: default
Log Message:

fix compilation

revert (incorrect temp table changes)


diffs (41 lines):

diff --git a/sql/backends/monet5/sql_gencode.c 
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -2292,7 +2292,6 @@ backend_dumpproc(backend *be, Client c, 
        int argc = 0;
        char arg[SMALLBUFSIZ];
        node *n;
-       str pipe;
 
        backup = c->curprg;
 
@@ -2359,7 +2358,7 @@ backend_dumpproc(backend *be, Client c, 
                q->token = REMsymbol;   // will be patched
                q = pushStr(mb, q, t);
                GDKfree(tt);
-               q = pushStr(mb, q, pipe= getSQLoptimizer(be->mvc));
+               q = pushStr(mb, q, getSQLoptimizer(be->mvc));
                m->Tparse = 0;
        }
        if (cq)
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -4053,7 +4053,7 @@ sql_trans_drop_table(sql_trans *tr, sql_
                list_append(tr->dropped, local_id);
        }
                
-       if (!isDeclaredTable(t) && !isTempSchema(s))
+       if (!isDeclaredTable(t))
                sys_drop_table(tr, t, drop_action);
 
        t->base.wtime = s->base.wtime = tr->wtime = tr->wstime;
@@ -4885,8 +4885,6 @@ sql_session_reset(sql_session *s, int ac
 
                        if (isGlobal(t) && isKindOfTable(t))
                                sql_trans_clear_table(s->tr, t);
-                       else 
-                               sql_trans_drop_table(s->tr, tmp, t->base.id, 
DROP_RESTRICT);
                }
        }
        assert(s->active == 0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list