MonetDB: default - fix optimized compilation

[Niels Nes]

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

fix optimized compilation


diffs (43 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
@@ -1880,7 +1880,7 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st
                } break;
                case st_update_col:
                case st_append_col:{
-                       int tids = _dumpstmt(sql, mb, s->op1), upd;
+                       int tids = _dumpstmt(sql, mb, s->op1), upd = 0;
                        sql_column *c = s->op4.cval;
                        char *n = (s->type==st_append_col)?appendRef:updateRef;
 
@@ -1904,7 +1904,7 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st
 
                case st_update_idx:
                case st_append_idx:{
-                       int tids = _dumpstmt(sql, mb, s->op1), upd;
+                       int tids = _dumpstmt(sql, mb, s->op1), upd = 0;
                        sql_idx *i = s->op4.idxval;
                        char *n = (s->type==st_append_idx)?appendRef:updateRef;
 
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -187,7 +187,7 @@ delta_update_bat( sql_delta *bat, BAT *t
 void
 delta_update_val( sql_delta *bat, oid rid, void *upd) 
 {
-       BAT *b;
+       BAT *b = NULL;
 
        assert(rid != oid_nil);
 
@@ -218,7 +218,8 @@ delta_update_val( sql_delta *bat, oid ri
                b = temp_descriptor(bat->ibid);
                void_inplace(b, rid, upd, TRUE);
        }
-       bat_destroy(b);
+       if (b)
+               bat_destroy(b);
 }
 
 static void
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list