Changeset: dc1d8e991845 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc1d8e991845
Added Files:
sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.sql
Modified Files:
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
configure.ag
monetdb5/mal/mal_linker.c
sql/ChangeLog.Mar2018
sql/test/BugTracker-2018/Tests/All
Branch: default
Log Message:
Merge with Mar2018 branch.
diffs (131 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -208,6 +208,8 @@ def am_additional_libs(name, sep, type,
if l[0] not in ("-", "$", "@"):
l = am_translate_dir(l, am) + ".la"
if c:
+ if c in ('NATIVE_WIN32', 'WIN32'):
+ continue
global libno
v = 'LIB%d' % libno
libno = libno + 1
@@ -241,6 +243,8 @@ def am_additional_install_libs(name, sep
l = l[3:]
l = 'install-%sLTLIBRARIES' % l
if c:
+ if c in ('NATIVE_WIN32', 'WIN32'):
+ continue
global libno
v = 'LIB%d' % libno
libno = libno + 1
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -209,6 +209,8 @@ def msc_additional_libs(fd, name, sep, t
for l in list:
if '?' in l:
c, l = l.split('?', 1)
+ if c in ('NATIVE_WIN32', 'WIN32'):
+ c = None
else:
c = None
d = None
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -743,6 +743,30 @@ AS_VAR_IF([enable_sanitizer], [no], [],
AC_SUBST([CFLAGS])
AC_SUBST([X_CFLAGS])
+AC_MSG_CHECKING([for ld -Bsymbolic option])
+save_LDFLAGS="$LDFLAGS"
+LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
+AC_LINK_IFELSE([
+ AC_LANG_SOURCE([[
+ @%:@include <stdio.h>
+ @%:@include <stdlib.h>
+ @%:@include <string.h>
+
+ @%:@if -_LARGEFILE64_SOURCE - -1 == 1
+ @%:@include <stdio.h>
+ @%:@endif
+ int main(int argc, char **av) {
+ char buf[24];
+ double d = atof("4.2");
+ if (argc == 0 || strchr(av[0], av[0][0]) != NULL)
+ snprintf(buf, sizeof(buf), "%f", d);
+ return 0;
+ }
+ ]])],
+ [result=yes],
+ [LDFLAGS="$save_LDFLAGS"; result=no])
+AC_MSG_RESULT([$result])
+
# icc needs -fPIC (but the current autoconf still uses -KPIC)
AS_CASE([$GCC-$CC-$host_os],
[-*icc*-linux*|-*ecc*-linux*], [
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -34,10 +34,6 @@
#define MAXMODULES 128
-#ifndef RTLD_DEEPBIND
-#define RTLD_DEEPBIND 0
-#endif
-
typedef struct{
str modname;
str fullname;
@@ -107,7 +103,7 @@ getAddress(str fcnname)
*
* the first argument must be the same as the base name of the
* library that is created in src/tools */
- dl = mdlopen("libmonetdb5", RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND);
+ dl = mdlopen("libmonetdb5", RTLD_NOW | RTLD_GLOBAL);
if (dl == NULL)
return NULL;
@@ -147,7 +143,7 @@ getAddress(str fcnname)
str
loadLibrary(str filename, int flag)
{
- int mode = RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND;
+ int mode = RTLD_NOW | RTLD_GLOBAL;
char nme[FILENAME_MAX];
void *handle = NULL;
str s;
diff --git a/sql/ChangeLog.Mar2018 b/sql/ChangeLog.Mar2018
--- a/sql/ChangeLog.Mar2018
+++ b/sql/ChangeLog.Mar2018
@@ -30,10 +30,7 @@
If a database object is dropped, the associated comment is also removed.
Note: it is not allowed or possible to add comments for temporary tables or
objects in schema "tmp".
- The sql catalog has been extended with system table: sys.comments and system
- views: sys.describe_all_objects and sys.commented_function_signatures. These
- system views are used by the dump functionality as provided in msqldump and
- mclient and not intended to be used by users or user applications.
+ The sql catalog has been extended with system table: sys.comments.
The keyword 'COMMENT' has now become a reserved keyword.
* Thu Dec 7 2017 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
diff --git a/sql/test/BugTracker-2018/Tests/All
b/sql/test/BugTracker-2018/Tests/All
--- a/sql/test/BugTracker-2018/Tests/All
+++ b/sql/test/BugTracker-2018/Tests/All
@@ -35,3 +35,4 @@ sqlitelogictest-groupby-having-not-in.Bu
sqlitelogictest-nested-case.Bug-6554
sqlitelogictest-complex-case-extra-columns.Bug-6555
sqlitelogictest-coalesce-division-by-zero.Bug-6556
+sqlitelogictest-having-not-null-not-in.Bug-6557
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.sql
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.sql
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.sql
@@ -0,0 +1,4 @@
+CREATE TABLE tab0(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+INSERT INTO tab0 VALUES(83,0,38), (26,0,79), (43,81,24);
+SELECT DISTINCT col2 FROM tab0 GROUP BY col2, col1 HAVING NOT NULL NOT IN (
AVG ( ALL + col1 ) );
+DROP TABLE tab0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
