Changeset: 81646daf2893 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/81646daf2893
Modified Files:
sql/test/BugTracker-2025/Tests/All
tools/mserver/mserver5.c
Branch: default
Log Message:
Merge with Mar2025 branch
diffs (126 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -147,6 +147,17 @@ macro(monetdb_macro_variables)
set(HAVE_RTREE ${RTREE_FOUND})
set(HAVE_OPENSSL ${OPENSSL_FOUND})
+ set(BUILD_TYPE ${CMAKE_BUILD_TYPE})
+ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_DEBUG}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_RELEASE}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_MINSIZEREL}")
+ else (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+ endif ()
+
if(MALLOC_FOUND)
if(${WITH_MALLOC} STREQUAL "jemalloc")
set(WITH_JEMALLOC 1)
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -111,7 +111,16 @@ function(monetdb_cmake_summary)
message(STATUS "Sphinx: ${SPHINX_FOUND}")
message(STATUS "Semodule: ${SEMODULE_FOUND}")
message(STATUS "Awk: ${AWK_FOUND}")
- message(STATUS "flags: ${CMAKE_C_FLAGS}")
+ message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
+ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_DEBUG}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_RELEASE}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_MINSIZEREL}")
+ else (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+ endif ()
message(STATUS "-----------------------------------------")
message(STATUS "")
endfunction()
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -321,8 +321,8 @@ MSscheduleClient(str command, str peer,
cleanUpScheduleClient(c, &command, &msg);
return;
}
- if (!GDKgetenv_isyes(mal_enableflag)
- && strncasecmp("sql", lang, 3) != 0
+ if (strncasecmp("sql", lang, 3) != 0
+ && strncasecmp("msql", lang, 3) != 0
&& strcmp(user, "monetdb") != 0) {
mnstr_printf(fout,
"!only the 'monetdb' user can
use non-sql languages. "
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -194,6 +194,9 @@
#cmakedefine HAVE_LIBPY3 1
#cmakedefine HAVE_OPENSSL 1
+#cmakedefine BUILD_TYPE "@BUILD_TYPE@"
+#cmakedefine EXTRA_C_FLAGS "@EXTRA_C_FLAGS@"
+
#cmakedefine WITH_JEMALLOC 1
#cmakedefine WITH_MIMALLOC 1
#cmakedefine WITH_TCMALLOC 1
diff --git
a/sql/test/BugTracker-2025/Tests/7654_non_monetdb_user_remote_table_exec.test.in
b/sql/test/BugTracker-2025/Tests/7654_non_monetdb_user_remote_table_exec.test.in
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2025/Tests/7654_non_monetdb_user_remote_table_exec.test.in
@@ -0,0 +1,21 @@
+@connection(id=c1, username=monetdb, password=monetdb)
+statement ok
+create user u1 with password 'u1' name 'u1'
+
+@connection(id=c1, username=monetdb, password=monetdb)
+statement ok
+create user u2 with password 'u2' name 'u2'
+
+@connection(id=c2, username=u1, password=u1)
+statement ok
+create table foo as select * from generate_series(0, 1000)
+
+@connection(id=c3, username=u2, password=u2)
+statement ok
+create remote table foo(value smallint) on
'mapi:monetdb://localhost:$MAPIPORT/$TSTDB/u1/foo' with user 'u1' password 'u1'
+
+@connection(id=c3, username=u2, password=u2)
+query I
+select count(*) from foo
+----
+1000
diff --git a/sql/test/BugTracker-2025/Tests/All
b/sql/test/BugTracker-2025/Tests/All
--- a/sql/test/BugTracker-2025/Tests/All
+++ b/sql/test/BugTracker-2025/Tests/All
@@ -15,3 +15,4 @@ 7636_antijoin_crash
7644_antijoin_crash
7645_not_likeselect
7646_leftjoin_crash
+7654_non_monetdb_user_remote_table_exec
diff --git a/sql/test/remote/Tests/different_user.SQL.py
b/sql/test/remote/Tests/different_user.SQL.py
--- a/sql/test/remote/Tests/different_user.SQL.py
+++ b/sql/test/remote/Tests/different_user.SQL.py
@@ -46,6 +46,7 @@ def worker_load(in_filename, workerrec,
c.execute(cmovies)
c.execute(screateq)
c.execute(load_data)
+ c.execute("SELECT COUNT(*) FROM movies")
# Setup and start workers
def create_workers(TMPDIR, workers, fn_template, nworkers, cmovies,
ratings_table_def_fk):
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -731,6 +731,8 @@ main(int argc, char **av)
mo_free_options(set, setlen);
if (GDKsetenv("monet_version", GDKversion()) != GDK_SUCCEED
+ || GDKsetenv("monet_build_type", BUILD_TYPE) != GDK_SUCCEED
+ || GDKsetenv("monet_extra_c_flags", EXTRA_C_FLAGS) !=
GDK_SUCCEED
|| GDKsetenv("monet_release",
#ifdef MONETDB_RELEASE
MONETDB_RELEASE
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
