Changeset: 45037ba33482 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45037ba33482
Modified Files:
        gdk/gdk_batop.c
Branch: Oct2012
Log Message:

make sure insert_string_bat handles inserting a void,str bat into
a oid,str bat.


diffs (14 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -147,6 +147,10 @@ insert_string_bat(BAT *b, BAT *n, int ap
        BATloop(n, p, q) {
                if (!append)
                        hp = b->H->type ? BUNhloc(ni, p) : NULL;
+               if (!append && b->H->type && !n->H->type) {
+                       o = n->H->seq;
+                       hp = &o;
+               }
 
                tp = b->T->type ? BUNtail(ni, p) : NULL;
                if (toff != ~ (size_t) 0) {
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to