Changeset: e494710f0741 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e494710f0741
Modified Files:
gdk/gdk_cbp.c
monetdb5/modules/mal/tablet.h
Branch: headless
Log Message:
Post merge fixes.
diffs (24 lines):
diff --git a/gdk/gdk_cbp.c b/gdk/gdk_cbp.c
--- a/gdk/gdk_cbp.c
+++ b/gdk/gdk_cbp.c
@@ -633,7 +633,7 @@ fixoidheap(void)
fixoidheapcolumn(b, nme, filename);
if (tp < 0)
- bs.type = tp;
+ b->type = tp;
CBPunfix(bid);
CBP_unload_inc(bid, "fixoidheap");
diff --git a/monetdb5/modules/mal/tablet.h b/monetdb5/modules/mal/tablet.h
--- a/monetdb5/modules/mal/tablet.h
+++ b/monetdb5/modules/mal/tablet.h
@@ -127,7 +127,7 @@ tablet_export oid TABLETload_file(Tablet
tablet_export oid SQLload_file(Client cntxt, Tablet * as, bstream *b, stream
*out, char *csep, char *rsep, char quote, lng skip, lng maxrow);
tablet_export COL **TABLETcollect(Tablet * as);
tablet_export COL *TABLETcollect_bats(Tablet * as);
-tablet_export COL **TABLETcollect_parts(Tablet * as, BUN offset);
+tablet_export COL **TABLETcollect_parts(Tablet * as, oid offset);
tablet_export void TABLETdestroy_format(Tablet * as);
tablet_export int TABLEToutput_file(Tablet * as, COL *order, stream *s);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
