Changeset: f4ea258b36e9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4ea258b36e9
Modified Files:
buildtools/doc/windowsbuild.rst
gdk/gdk_calc.c
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (41 lines):
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -691,13 +691,12 @@ Studio Tools`` -> ``Visual Studio x64 Wi
(this is for a 64-bit build on a 64-bit version of the operating
system).
-When using the Intel compiler, you also need to set the ``CC`` and
-``CXX`` variables::
+When using the Intel compiler, you also need to set the ``CC``
+variable::
set CC=icl -Qstd=c99 -GR- -Qsafeseh-
- set CXX=icl -Qstd=c99 -GR- -Qsafeseh-
-(These are the values for the 10.1 and 11.1 versions, for 9.1 replace
+(This is the value for the 10.1 and 11.1 versions, for 9.1 replace
``-Qstd=c99`` with ``-Qc99``.)
Internal Variables
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -259,7 +259,7 @@ BATcalcnot(BAT *b, BAT *s)
bn->trevsorted = nils == 0 && b->tsorted;
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- bn->tkey = b->tkey;
+ bn->tkey = b->tkey && nils <= 1;
if (nils != 0 && !b->tnil) {
b->tnil = true;
@@ -378,7 +378,7 @@ BATcalcnegate(BAT *b, BAT *s)
bn->trevsorted = nils == 0 && b->tsorted;
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- bn->tkey = b->tkey;
+ bn->tkey = b->tkey && nils <= 1;
if (nils != 0 && !b->tnil) {
b->tnil = true;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
