Changeset: e7f4287f192e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e7f4287f192e
Modified Files:
NT/Makefile
gdk/gdk_select.c
Branch: Nov2019
Log Message:
Merge with Apr2019 branch.
diffs (25 lines):
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -25,6 +25,8 @@ all: _all
install: targetdirs all
$(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
$(INSTALL) .monetdb "$(sysconfdir)"
+
+makewxs:
$(PYTHON) $(NT)\mksqlwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)"
"$(prefix)" > "$(prefix)\MonetDB5-SQL-Installer.wxs"
$(PYTHON) $(NT)\mkodbcwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)"
"$(prefix)" > "$(prefix)\MonetDB-ODBC-Installer.wxs"
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1201,7 +1201,8 @@ ilog2(BUN x)
* v1 v2 true false true x < v1 or x >= v2
* v1 v2 false true true x <= v1 or x > v2
* v1 v2 true true true x < v1 or x > v2
- * v2 v1 ignored ignored ignored NOTHING
+ * v2 v1 ignored ignored false NOTHING
+ * v2 v1 ignored ignored true x != nil
*/
BAT *
BATselect(BAT *b, BAT *s, const void *tl, const void *th,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
