Changeset: 7a2517ae34cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a2517ae34cc
Modified Files:
gdk/gdk_select.c
sql/backends/monet5/sql_statistics.c
Branch: Jul2017
Log Message:
Merge with Dec2016 branch.
diffs (25 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1056,7 +1056,8 @@ BAT_scanselect(BAT *b, BAT *s, BAT *bn,
* v != nil, v1 != nil, v2 != nil, v1 < v2.
* tl th li hi anti result list of OIDs for values
* -----------------------------------------------------------------
- * nil NULL ignored ignored false x = nil (only way to get nil)
+ * nil NULL true ignored false x = nil (only way to get nil)
+ * nil NULL false ignored false NOTHING
* nil NULL ignored ignored true x != nil
* nil nil ignored ignored false x != nil
* nil nil ignored ignored true NOTHING
diff --git a/sql/backends/monet5/sql_statistics.c
b/sql/backends/monet5/sql_statistics.c
--- a/sql/backends/monet5/sql_statistics.c
+++ b/sql/backends/monet5/sql_statistics.c
@@ -142,7 +142,7 @@ sql_analyze(Client cntxt, MalBlkPtr mb,
bsample = BATsample(bn,
(BUN) samplesize);
} else
bsample = NULL;
- br = BATselect(bn, bsample,
ATOMnilptr(bn->ttype), NULL, 0, 0, 0);
+ br = BATselect(bn, bsample,
ATOMnilptr(bn->ttype), NULL, 1, 0, 0);
if (br == NULL) {
BBPunfix(bn->batCacheid);
/* XXX throw error
instead? */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
