MonetDB: Aug2011 - merging heads

[Stefan Manegold]

Changeset: 4c804b70654f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c804b70654f
Modified Files:
        
Branch: Aug2011
Log Message:

merging heads


diffs (24 lines):

diff --git a/sql/backends/monet5/sql_result.mx 
b/sql/backends/monet5/sql_result.mx
--- a/sql/backends/monet5/sql_result.mx
+++ b/sql/backends/monet5/sql_result.mx
@@ -157,6 +157,8 @@ sql_time_tostr(void *TS_RES, char **buf,
        tmp = (daytime) val;
 
        len1 = daytime_tostr(&s1, &big, &tmp);
+       if (len1 == 3 && strcmp(s1, "nil") == 0) 
+               return len1;
 
        /* fixup the fraction, default is 3 */
        len1 += (ts_res->fraction-3);
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
@@ -948,7 +948,7 @@ destroy_delta(sql_delta *b)
        if (b->bid) 
                temp_destroy(b->bid);
        if (b->cached)
-               temp_destroy(b->cached->batCacheid);
+               bat_destroy(b->cached);
        b->bid = b->ibid = b->ubid = 0;
        b->name = NULL;
        b->cached = NULL;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list