MonetDB: Feb2013 - Merge with Oct2012 branch.

[Sjoerd Mullender]

Changeset: 757facd86ed8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=757facd86ed8
Modified Files:
        gdk/gdk_heap.c
        monetdb5/modules/mal/tablet.c
        sql/backends/monet5/rel_bin.c
        sql/storage/bat/bat_storage.c
Branch: Feb2013
Log Message:

Merge with Oct2012 branch.


diffs (35 lines):

diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -468,7 +468,8 @@ HEAPextend(Heap *h, size_t size)
                }
                *h = bak;
        }
-       GDKerror("HEAPextend: failed to extend to " SZFMT " for %s%s\n", size, 
nme, ext ? ext : "");
+       GDKerror("HEAPextend: failed to extend to " SZFMT " for %s%s%s\n",
+                size, nme, ext ? "." : "", ext ? ext : "");
        return -1;
 }
 
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1102,6 +1102,7 @@ SQLworker_column(READERtask *task, int c
                                } else
                                        BUNins(task->as->complaints, NULL, err, 
TRUE);
                                MT_lock_unset(&mal_copyLock, "tablet insert 
value");
+                               break;
                        }
                }
 
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
@@ -1341,6 +1341,7 @@ tr_update_delta( sql_trans *tr, sql_delt
                                obat->ibid = temp_copy(ci->batCacheid, FALSE);
                                bat_destroy(ci);
                                ci = temp_descriptor(obat->ibid);
+                               BATseqbase(ci, cbat->ibase);
                        }
                        assert(obat->ibase == cbat->ibase);
                        append_inserted(ci, ins);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list