--- libmariadb/ma_context.c.orig	2023-12-01 21:03:52.112844632 -0800
+++ libmariadb/ma_context.c	2023-12-01 21:05:41.829732641 -0800
@@ -91,7 +91,7 @@
 my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
 {
   int err;
-  union pass_void_ptr_as_2_int u;
+  union pass_void_ptr_as_2_int u = { .a = { 0, 0 }};
 
   err= getcontext(&c->spawned_context);
   if (err)
--- plugins/auth/CMakeLists.txt.orig	2023-11-01 03:28:04.000000000 -0700
+++ plugins/auth/CMakeLists.txt	2023-12-01 21:06:36.118190964 -0800
@@ -31,7 +31,7 @@
 REGISTER_PLUGIN(TARGET dialog
                 TYPE MARIADB_CLIENT_PLUGIN_AUTH
                 CONFIGURATIONS DYNAMIC STATIC OFF
-                DEFAULT DYNAMIC
+                DEFAULT OFF
                 SOURCES ${CC_SOURCE_DIR}/plugins/auth/dialog.c
                         ${CC_SOURCE_DIR}/libmariadb/get_password.c)
 
@@ -130,13 +130,13 @@
 REGISTER_PLUGIN(TARGET mysql_old_password
                 TYPE MARIADB_CLIENT_PLUGIN_AUTH
                 CONFIGURATIONS STATIC DYNAMIC OFF
-                DEFAULT STATIC
+                DEFAULT OFF
                 SOURCES ${AUTH_DIR}/old_password.c)
 
 # Cleartext
 REGISTER_PLUGIN(TARGET mysql_clear_password
                 TYPE MARIADB_CLIENT_PLUGIN_AUTH
                 CONFIGURATIONS DYNAMIC STATIC OFF
-                DEFAULT DYNAMIC
+                DEFAULT OFF
                 SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
 
--- plugins/io/CMakeLists.txt.orig	2023-11-01 03:28:04.000000000 -0700
+++ plugins/io/CMakeLists.txt	2023-12-01 21:06:36.118190964 -0800
@@ -7,7 +7,7 @@
     REGISTER_PLUGIN(TARGET remote_io
                   TYPE MARIADB_CLIENT_PLUGIN_IO
                   CONFIGURATIONS DYNAMIC STATIC OFF
-                  DEFAULT DYNAMIC
+                  DEFAULT OFF
                   SOURCES ${CC_SOURCE_DIR}/plugins/io/remote_io.c
                   INCLUDES ${CURL_INCLUDE_DIR}
                   LIBRARIES ${CURL_LIBRARIES})