Changeset: efbe058699c6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=efbe058699c6
Modified Files:
sql/backends/monet5/sql.mx
Branch: default
Log Message:
Merge with Apr2011 branch.
diffs (52 lines):
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -30,13 +30,13 @@
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/mutils)
-GDK_VERSION=3:0:0
+GDK_VERSION=3:1:0
# version of the MAPI library (subdirectory clients/mapilib)
-MAPI_VERSION=3:0:0
+MAPI_VERSION=3:1:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=7:0:0
+MONETDB5_VERSION=7:1:0
# version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=2:0:0
+STREAM_VERSION=2:1:0
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
@@ -3466,9 +3466,19 @@
throw(SQL,"sql", "table %s not found", tname);
if (list_length(t->columns.set) != (pci->argc-3))
throw(SQL,"sql", "Not enough columns in found");
+
+ for (i = 3, n = t->columns.set->h; i<pci->argc && n; i++, n = n->next) {
+ sql_column *col = n->data;
+
+ if (ATOMvarsized(col->type.type->localtype ))
+ throw(SQL, "sql", "failed to attach file %s",
+ *(str*)getArgReference(stk, pci, i));
+ }
+
b = BATnew(TYPE_str, TYPE_bat, pci->argc-3);
if( b == NULL)
throw(SQL, "sql.import", MAL_MALLOC_FAIL);
+
for (i = 3, n = t->columns.set->h; i<pci->argc && n; i++, n = n->next) {
sql_column *col = n->data;
BAT *c;
diff --git a/sql/test/BugTracker-2011/Tests/All
b/sql/test/BugTracker-2011/Tests/All
--- a/sql/test/BugTracker-2011/Tests/All
+++ b/sql/test/BugTracker-2011/Tests/All
@@ -9,3 +9,4 @@
crash_on_alias.Bug-2798
groupby_primary_key.Bug-2807
merge_range_exp.Bug-2806
+count-count-distinct.Bug-2808
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
