Changeset: 10747c3398e4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10747c3398e4
Modified Files:
monetdb5/modules/kernel/bat5.c
sql/server/rel_updates.c
Branch: Dec2016
Log Message:
Merge with Jun2016 branch.
diffs (33 lines):
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -1056,7 +1056,7 @@ BKCshrinkBAT(bat *ret, const bat *bid, c
BBPunfix(b->batCacheid);
throw(MAL, "bat.shrink", RUNTIME_OBJECT_MISSING);
}
- bn= COLnew(0, b->ttype, BATcount(b) - BATcount(d) , TRANSIENT);
+ bn= COLnew(0, b->ttype, BATcount(b) - BATcount(d), b->batRole);
if (bn == NULL) {
BBPunfix(b->batCacheid);
BBPunfix(d->batCacheid);
@@ -1221,7 +1221,7 @@ BKCreuseBAT(bat *ret, const bat *bid, co
BBPunfix(b->batCacheid);
throw(MAL, "bat.reuse", RUNTIME_OBJECT_MISSING);
}
- bn= COLnew(b->hseqbase, b->ttype, BATcount(b) - BATcount(d), TRANSIENT);
+ bn= COLnew(b->hseqbase, b->ttype, BATcount(b) - BATcount(d),
b->batRole);
if (bn == NULL) {
BBPunfix(b->batCacheid);
BBPunfix(d->batCacheid);
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1275,6 +1275,8 @@ copyfrom(mvc *sql, dlist *qname, dlist *
}
/* lock the store, for single user/transaction */
if (locked) {
+ if (headers)
+ return sql_error(sql, 02, "COPY INTO .. LOCKED: not
allowed with column lists");
store_lock();
while (store_nr_active > 1) {
store_unlock();
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
