Changeset: 4718459e3fec for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4718459e3fec
Modified Files:
sql/server/rel_select.c
Branch: default
Log Message:
Merged with Oct2020
diffs (truncated from 880 to 300 lines):
diff --git a/ctest/cmake/detect-bz2.cmake b/ctest/cmake/detect-bz2.cmake
--- a/ctest/cmake/detect-bz2.cmake
+++ b/ctest/cmake/detect-bz2.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename BZIP2_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBBZ2
- variablename BZIP2_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBBZ2
- variablename BZIP2_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_LIBBZ2
diff --git a/ctest/cmake/detect-commoncrypto.cmake
b/ctest/cmake/detect-commoncrypto.cmake
--- a/ctest/cmake/detect-commoncrypto.cmake
+++ b/ctest/cmake/detect-commoncrypto.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename COMMONCRYPTO_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_COMMONCRYPTO
- variablename COMMONCRYPTO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_COMMONCRYPTO
- variablename COMMONCRYPTO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect FALSE
legacyvariable HAVE_COMMONCRYPTO
diff --git a/ctest/cmake/detect-curl.cmake b/ctest/cmake/detect-curl.cmake
--- a/ctest/cmake/detect-curl.cmake
+++ b/ctest/cmake/detect-curl.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename CURL_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_CURL
- variablename CURL_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_CURL
- variablename CURL_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_CURL
diff --git a/ctest/cmake/detect-fits.cmake b/ctest/cmake/detect-fits.cmake
--- a/ctest/cmake/detect-fits.cmake
+++ b/ctest/cmake/detect-fits.cmake
@@ -31,19 +31,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename CFITSIO_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_FITS
- variablename CFITSIO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_FITS
- variablename CFITSIO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_FITS
diff --git a/ctest/cmake/detect-gdal.cmake b/ctest/cmake/detect-gdal.cmake
--- a/ctest/cmake/detect-gdal.cmake
+++ b/ctest/cmake/detect-gdal.cmake
@@ -27,24 +27,17 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename GDAL_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "32")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_SHP
variablename GDAL_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
+ elseif(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect FALSE
legacyvariable HAVE_SHP
variablename GDAL_FOUND)
endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_SHP
- variablename GDAL_FOUND)
- endif()
else()
message(ERROR "Linux distro: ${LINUX_DISTRO} not known")
message(ERROR "Linux distro version: ${LINUX_DISTRO_VERSION} not known")
diff --git a/ctest/cmake/detect-geos.cmake b/ctest/cmake/detect-geos.cmake
--- a/ctest/cmake/detect-geos.cmake
+++ b/ctest/cmake/detect-geos.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename GEOS_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_GEOM
- variablename GEOS_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_GEOM
- variablename GEOS_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_GEOM
diff --git a/ctest/cmake/detect-getaddrinfo.cmake
b/ctest/cmake/detect-getaddrinfo.cmake
--- a/ctest/cmake/detect-getaddrinfo.cmake
+++ b/ctest/cmake/detect-getaddrinfo.cmake
@@ -25,15 +25,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
set(UNDETECT "1")
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- set(DETECT "0")
- set(UNDETECT "1")
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- set(DETECT "0")
- set(UNDETECT "1")
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
set(DETECT "0")
set(UNDETECT "1")
endif()
diff --git a/ctest/cmake/detect-iconv.cmake b/ctest/cmake/detect-iconv.cmake
--- a/ctest/cmake/detect-iconv.cmake
+++ b/ctest/cmake/detect-iconv.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename Iconv_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_ICONV
- variablename Iconv_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_ICONV
- variablename Iconv_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_ICONV
diff --git a/ctest/cmake/detect-libpy3.cmake b/ctest/cmake/detect-libpy3.cmake
--- a/ctest/cmake/detect-libpy3.cmake
+++ b/ctest/cmake/detect-libpy3.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename Python3_NumPy_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBPY3
- variablename Python3_NumPy_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBPY3
- variablename Python3_NumPy_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_LIBPY3
diff --git a/ctest/cmake/detect-libr.cmake b/ctest/cmake/detect-libr.cmake
--- a/ctest/cmake/detect-libr.cmake
+++ b/ctest/cmake/detect-libr.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename LIBR_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBR
- variablename LIBR_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBR
- variablename LIBR_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_LIBR
diff --git a/ctest/cmake/detect-libz.cmake b/ctest/cmake/detect-libz.cmake
--- a/ctest/cmake/detect-libz.cmake
+++ b/ctest/cmake/detect-libz.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename ZLIB_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBZ
- variablename ZLIB_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBZ
- variablename ZLIB_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_LIBZ
diff --git a/ctest/cmake/detect-lz4.cmake b/ctest/cmake/detect-lz4.cmake
--- a/ctest/cmake/detect-lz4.cmake
+++ b/ctest/cmake/detect-lz4.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename LZ4_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBLZ4
- variablename LZ4_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBLZ4
- variablename LZ4_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_LIBLZ4
diff --git a/ctest/cmake/detect-lzma.cmake b/ctest/cmake/detect-lzma.cmake
--- a/ctest/cmake/detect-lzma.cmake
+++ b/ctest/cmake/detect-lzma.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename LIBLZMA_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
