MonetDB: default - fix reference counting

[Niels Nes]

Changeset: 956d50cb6240 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=956d50cb6240
Modified Files:
        sql/backends/monet5/rel_bin.c
        sql/server/rel_psm.c
Branch: default
Log Message:

fix reference counting
removed bogus assert


diffs (32 lines):

diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -3143,7 +3143,6 @@ sql_insert_triggers(backend *be, sql_tab
        
                        sql_stack_add_inserted(sql, n, t, updates);
                        s = sql_parse(be, sql->sa, trigger->statement, 
m_instantiate);
-                       assert(!trigger->condition);
                        
                        if (!s) 
                                return 0;
@@ -4047,7 +4046,7 @@ sql_stack_add_updated(mvc *sql, const ch
                
        /* put single table into the stack with 2 names, needed for the psm 
code */
        stack_push_rel_view(sql, on, r);
-       stack_push_rel_view(sql, nn, r);
+       stack_push_rel_view(sql, nn, rel_dup(r));
 }
 
 static int
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -1146,7 +1146,7 @@ create_trigger(mvc *sql, dlist *qname, i
                if (new_name)
                        stack_update_rel_view(sql, new_name, rel);
                if (old_name)
-                       stack_update_rel_view(sql, old_name, rel);
+                       stack_update_rel_view(sql, old_name, 
new_name?rel_dup(rel):rel);
        }
        sq = sequential_block(sql, NULL, NULL, stmts, NULL, 1);
        r = rel_psm_block(sql->sa, sq);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list