Changeset: ea683fa90092 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ea683fa90092
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (93 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ monetdb_configure_misc()
# Some custom target will need these setting.
include(monetdb-custom-targets)
-if(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" AND NOT
${CPACK_PACKAGING_INSTALL_PREFIX} STREQUAL "/")
+if(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -32,8 +32,7 @@ mcrypt_getHashAlgorithms(void)
* desire.
*/
static const char *algorithms =
- "INVALID"
- ",RIPEMD160"
+ "RIPEMD160"
",SHA512"
",SHA384"
",SHA256"
diff --git a/sql/test/SQLancer/Tests/sqlancer18.test
b/sql/test/SQLancer/Tests/sqlancer18.test
--- a/sql/test/SQLancer/Tests/sqlancer18.test
+++ b/sql/test/SQLancer/Tests/sqlancer18.test
@@ -680,5 +680,21 @@ SELECT 1 FROM v100 AS vx WHERE vx.vc0 =
statement error 42000!COUNT: aggregate functions not allowed in WHERE clause
SELECT 1 FROM v100 WHERE (SELECT 1 HAVING count(v100.vc0 + (SELECT 1 FROM
v104)))
+statement error 42000!SELECT: cannot use non GROUP BY column 'vx.vc0' in query
results without an aggregate function
+SELECT vx.vc0 < ANY(SELECT sum(vx.vc0) FROM tx) FROM (select 240 FROM tx)
vx(vc0)
+
+statement error 42000!SELECT: subquery uses ungrouped column "vx.vc0" from
outer query
+SELECT sum(vx.vc0) < ANY(SELECT vx.vc0 FROM tx) FROM (select 240 FROM tx)
vx(vc0)
+
+#these are right
+query I nosort
+SELECT sum(vx.vc0) < ANY(SELECT sum(vx.vc0) FROM tx) FROM (select 240 FROM tx)
vx(vc0)
+----
+0
+
+query I nosort
+SELECT vx.vc0 < ANY(SELECT vx.vc0 FROM tx) FROM (select 240 FROM tx) vx(vc0)
+----
+
statement ok
DROP TABLE "tx" CASCADE
diff --git a/tools/merovingian/ChangeLog.Jan2022
b/tools/merovingian/ChangeLog.Jan2022
--- a/tools/merovingian/ChangeLog.Jan2022
+++ b/tools/merovingian/ChangeLog.Jan2022
@@ -1,3 +1,10 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
+* Thu Jan 6 2022 Martin van Dinther <[email protected]>
+- Disabled logging into merovingian.log of next info message types:
+ - proxying client <host>:<port> for database '<dbname>' to <url>
+ - target connection is on local UNIX domain socket, passing on
filedescriptor instead of proxying
+ These messages were written to the log file at each connection. In most
+ cases this information is not used. The disabling reduces the log file size.
+
diff --git a/tools/merovingian/daemon/client.c
b/tools/merovingian/daemon/client.c
--- a/tools/merovingian/daemon/client.c
+++ b/tools/merovingian/daemon/client.c
@@ -371,9 +371,11 @@ handleClient(void *data)
close_stream(fout);
close_stream(fdin);
} else {
+ /* Jan2022: disabled logging of next info message to reduce
merovingian.log size:
Mfprintf(stdout, "proxying client %s for database '%s' to "
"%s?database=%s\n",
host, database, redirs[0].conns->val,
redirs[0].dbname);
+ */
/* merovingian is in control, only consider the first redirect
*/
mnstr_printf(fout, "^mapi:merovingian://proxy?database=%s\n",
redirs[0].dbname);
diff --git a/tools/merovingian/daemon/proxy.c b/tools/merovingian/daemon/proxy.c
--- a/tools/merovingian/daemon/proxy.c
+++ b/tools/merovingian/daemon/proxy.c
@@ -184,8 +184,10 @@ startProxy(int psock, stream *cfdin, str
msg.msg_controllen = cmsg->cmsg_len;
msg.msg_flags = 0;
+ /* Jan2022: disabled logging of next info message to reduce
merovingian.log size:
Mfprintf(stdout, "target connection is on local UNIX domain
socket, "
"passing on filedescriptor instead of
proxying\n");
+ */
if (sendmsg(ssock, &msg, 0) < 0) {
closesocket(ssock);
return(newErr("could not send initial byte: %s",
strerror(errno)));
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
