diff --git a/mysql-test/main/mysql_upgrade.result b/mysql-test/main/mysql_upgrade.result
index a517a7dca29..bc33cc75cfa 100644
--- a/mysql-test/main/mysql_upgrade.result
+++ b/mysql-test/main/mysql_upgrade.result
@@ -1062,7 +1062,7 @@ set global sql_safe_updates=@orig_sql_safe_updates;
 # MDEV-32043 Remove plugins previously external that are now built in (unix_socket)
 #
 INSERT INTO mysql.plugin SELECT 'unix_socket', 'auth_socket.so'
-    FROM dual WHERE convert(@@version_compile_os using latin1) not in ('Win32', 'Win64', 'Windows');
+    FROM information_schema.plugins WHERE plugin_name='unix_socket' AND plugin_library IS NULL;
 # mariadb-upgrade --force --silent 2>&1
 SELECT * FROM mysql.plugin WHERE name='unix_socket';
 name	dl
diff --git a/mysql-test/main/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test
index 630f9d4574a..647106facf1 100644
--- a/mysql-test/main/mysql_upgrade.test
+++ b/mysql-test/main/mysql_upgrade.test
@@ -500,7 +500,7 @@ set global sql_safe_updates=@orig_sql_safe_updates;
 --echo #
 
 INSERT INTO mysql.plugin SELECT 'unix_socket', 'auth_socket.so'
-    FROM dual WHERE convert(@@version_compile_os using latin1) not in ('Win32', 'Win64', 'Windows');
+    FROM information_schema.plugins WHERE plugin_name='unix_socket' AND plugin_library IS NULL;
 --echo # mariadb-upgrade --force --silent 2>&1
 --exec $MYSQL_UPGRADE --force --silent 2>&1
 SELECT * FROM mysql.plugin WHERE name='unix_socket';
diff --git a/plugin/auth_socket/CMakeLists.txt b/plugin/auth_socket/CMakeLists.txt
index a3f42d416a7..57227b3cc52 100644
--- a/plugin/auth_socket/CMakeLists.txt
+++ b/plugin/auth_socket/CMakeLists.txt
@@ -15,7 +15,9 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA
 
 CHECK_CXX_SOURCE_COMPILES(
-"#define _GNU_SOURCE
+"#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 #include <sys/socket.h>
 int main() {
   struct ucred cred;