Don't link plugins with libmysys.a or libmysys_ssl.a

we don't want mysys static data structures to be overwritten when a dynamic plugin is loaded.
MariaDB · Feb 15, 2015 · 985ef1d · 985ef1d
1 parent 4c9d0b2
commit 985ef1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/my_aes.h b/include/my_aes.h
@@ -77,7 +77,7 @@ typedef int (*my_aes_encrypt_dynamic_type)(const uchar* source, uint32 source_le
                                            const uchar* iv, uint8 iv_length,
                                            uint noPadding);
 
-extern my_aes_encrypt_dynamic_type my_aes_encrypt_dynamic;
+extern MYSQL_PLUGIN_IMPORT my_aes_encrypt_dynamic_type my_aes_encrypt_dynamic;
 
 /**
   AES decryption AES dynamic (defined at startup) encryption algorithm.
@@ -107,7 +107,7 @@ typedef int (*my_aes_decrypt_dynamic_type)(const uchar *source,
                                            const uchar *key, uint8 key_length,
                                            const uchar *iv, uint8 iv_length,
                                            uint noPadding);
-extern my_aes_decrypt_dynamic_type my_aes_decrypt_dynamic;
+extern MYSQL_PLUGIN_IMPORT my_aes_decrypt_dynamic_type my_aes_decrypt_dynamic;
 
 /**
    Initialize dynamic crypt functions

diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
@@ -472,5 +472,5 @@ ENDIF()
 MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE
   MODULE_ONLY
   MODULE_OUTPUT_NAME ha_innodb
-  LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT} pcre pcreposix mysys_ssl)
+  LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT} pcre pcreposix)