Merge 10.6 into 10.7

Author: dr-m

cmake/plugin.cmake

@@ -285,15 +285,20 @@ MACRO(MYSQL_ADD_PLUGIN)
     INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/" "plugin/${subpath}")
   ENDIF()
 
-  GET_TARGET_PROPERTY(plugin_type ${target} TYPE)
-  STRING(REGEX REPLACE "_LIBRARY$" "" plugin_type ${plugin_type})
-  STRING(REGEX REPLACE "^NO$" "" plugin_type ${plugin_type})
+  IF(TARGET ${target})
+    GET_TARGET_PROPERTY(plugin_type ${target} TYPE)
+    STRING(REPLACE "_LIBRARY" "" plugin_type ${plugin_type})
+    SET(have_target 1)
+  ELSE()
+    SET(plugin_type)
+    SET(have_target 0)
+  ENDIF()
   IF(ARG_STORAGE_ENGINE)
-    ADD_FEATURE_INFO(${plugin} PLUGIN_${plugin} "Storage Engine ${plugin_type}")
+    ADD_FEATURE_INFO(${plugin} ${have_target} "Storage Engine ${plugin_type}")
   ELSEIF(ARG_CLIENT)
-    ADD_FEATURE_INFO(${plugin} PLUGIN_${plugin} "Client plugin ${plugin_type}")
+    ADD_FEATURE_INFO(${plugin} ${have_target} "Client plugin ${plugin_type}")
   ELSE()
-    ADD_FEATURE_INFO(${plugin} PLUGIN_${plugin} "Server plugin ${plugin_type}")
+    ADD_FEATURE_INFO(${plugin} ${have_target} "Server plugin ${plugin_type}")
   ENDIF()
   ENDIF(NOT WITHOUT_SERVER OR ARG_CLIENT)
 ENDMACRO()

include/my_global.h

@@ -22,16 +22,12 @@
 
 /*
   MDEV-25602 Deprecate __WIN__ symbol.
-  Temporarily, allow inside connect engine,
-  until fixed in upstream.
 */
-#ifndef connect_EXPORTS
-#ifdef _MSC_VER
+#if defined (_MSC_VER) && !defined(__clang__)
 #pragma deprecated("__WIN__")
 #elif defined (__GNUC__)
 #pragma GCC poison __WIN__
 #endif
-#endif
 
 /*
   InnoDB depends on some MySQL internals which other plugins should not

mysql-test/main/func_group.test

@@ -1,6 +1,10 @@
 #
 # simple test of all group functions
 #
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Test temporarily disabled for ps-protocol
+}
 
 --disable_warnings
 drop table if exists t1,t2,t3,t4,t5,t6;

plugin/auth_socket/CMakeLists.txt

@@ -57,6 +57,21 @@ IF (HAVE_XUCRED)
   SET(ok 1)
 ELSE()
 
+# NetBSD, is that you?
+CHECK_CXX_SOURCE_COMPILES(
+"#include <sys/un.h>
+#include <sys/socket.h>
+int main() {
+  struct unpcbid unp;
+  socklen_t unpl = sizeof(unp);
+  getsockopt(0, 0, LOCAL_PEEREID, &unp, &unpl);
+  }" HAVE_UNPCBID)
+
+IF (HAVE_UNPCBID)
+  ADD_DEFINITIONS(-DHAVE_UNPCBID)
+  SET(ok 1)
+ELSE()
+
 # illumos, is that you?
 CHECK_CXX_SOURCE_COMPILES(
 "#include <ucred.h>
@@ -104,6 +119,7 @@ ENDIF()
 ENDIF()
 ENDIF()
 ENDIF()
+ENDIF()
 
 IF(ok)
   MYSQL_ADD_PLUGIN(auth_socket auth_socket.c DEFAULT)

plugin/auth_socket/auth_socket.c

@@ -47,6 +47,13 @@
 #define uid cr_uid
 #define ucred xucred
 
+#elif defined HAVE_UNPCBID
+#include <sys/un.h>
+#define level 0
+#define SO_PEERCRED LOCAL_PEEREID
+#define uid unp_euid
+#define ucred unpcbid
+
 #elif defined HAVE_GETPEERUCRED
 #include <ucred.h>
 

storage/connect/CMakeLists.txt

@@ -72,7 +72,7 @@ IF(UNIX)
   get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
   SET(CONNECT_SOURCES ${CONNECT_SOURCES} inihandl.cpp)
   SET(IPHLPAPI_LIBRARY "")
-ELSE(NOT UNIX)
+ELSE()
   SET(CONNECT_SOURCES ${CONNECT_SOURCES}
   tabwmi.cpp tabwmi.h tabmac.cpp tabmac.h macutil.cpp macutil.h)
   # Add exception handling to the CONNECT project)
@@ -82,8 +82,7 @@ ELSE(NOT UNIX)
     # Connect does not work with clang-cl
     RETURN()
   ENDIF()
-  add_definitions(-D__WIN__)
-ENDIF(UNIX)
+ENDIF()
 
 
 #

storage/connect/noconst.c

@@ -5,11 +5,11 @@
 #include <mysqld.h>
 #include <string.h>
 
-#if defined(__WIN__)
+#if defined(_WIN32)
 #define DllExport  __declspec( dllexport )
-#else   // !__WIN__
+#else   // !_WIN32
 #define DllExport
-#endif  // !__WIN__
+#endif  // !_WIN32
 
 extern "C" {
 	DllExport my_bool noconst_init(UDF_INIT*, UDF_ARGS*, char*);