Changeset: bcdf2606e893 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bcdf2606e893
Modified Files:
sql/backends/monet5/sql.mx
Branch: Apr2011
Log Message:
Fix for bug 2832.
The cast code needs to differentiate between varsized and non-varsized
data types.
diffs (45 lines):
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -4027,7 +4027,7 @@
msg = str_2_@1( &r, &v );
if (msg)
break;
- BUNins(dst, BUNhead(bi,p), &r, FALSE);
+ BUNins(dst, BUNhead(bi,p), @5 r, FALSE);
}
BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
@@ -4035,19 +4035,19 @@
return msg;
}
@c
-@:cast(bit,bitToStr,bit, *res = *(bit*)p)@
-@:cast(oid,OIDtoStr,oid, *res = *(oid*)p)@
-@:cast(bte,bteToStr,bte, *res = *(bte*)p)@
-@:cast(sht,shtToStr,sht, *res = *(sht*)p)@
-@:cast(int,intToStr,int, *res = *(int*)p)@
-@:cast(lng,lngToStr,lng, *res = *(lng*)p)@
-@:cast(wrd,wrdToStr,wrd, *res = *(wrd*)p)@
-@:cast(flt,fltToStr,flt, *res = *(flt*)p)@
-@:cast(dbl,dblToStr,dbl, *res = *(dbl*)p)@
-@:cast(timestamp,timestamp_tostr,timestamp, *res = *(timestamp*)p)@
-@:cast(daytime,daytime_tostr,daytime, *res = *(daytime*)p)@
-@:cast(date,date_tostr,date, *res = *(date*)p)@
-@:cast(sqlblob,sqlblob_tostr,sqlblob*, *res = (sqlblob*)p)@
+@:cast(bit,bitToStr,bit, *res = *(bit*)p,&)@
+@:cast(oid,OIDtoStr,oid, *res = *(oid*)p,&)@
+@:cast(bte,bteToStr,bte, *res = *(bte*)p,&)@
+@:cast(sht,shtToStr,sht, *res = *(sht*)p,&)@
+@:cast(int,intToStr,int, *res = *(int*)p,&)@
+@:cast(lng,lngToStr,lng, *res = *(lng*)p,&)@
+@:cast(wrd,wrdToStr,wrd, *res = *(wrd*)p,&)@
+@:cast(flt,fltToStr,flt, *res = *(flt*)p,&)@
+@:cast(dbl,dblToStr,dbl, *res = *(dbl*)p,&)@
+@:cast(timestamp,timestamp_tostr,timestamp, *res = *(timestamp*)p,&)@
+@:cast(daytime,daytime_tostr,daytime, *res = *(daytime*)p,&)@
+@:cast(date,date_tostr,date, *res = *(date*)p,&)@
+@:cast(sqlblob,sqlblob_tostr,sqlblob*, *res = (sqlblob*)p,)@
str
SQLstr_2_str( str *res, str *val )
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
