Commit 985ef1d4 authored by Sergei Golubchik's avatar Sergei Golubchik

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.
parent 4c9d0b2b
...@@ -77,7 +77,7 @@ typedef int (*my_aes_encrypt_dynamic_type)(const uchar* source, uint32 source_le ...@@ -77,7 +77,7 @@ typedef int (*my_aes_encrypt_dynamic_type)(const uchar* source, uint32 source_le
const uchar* iv, uint8 iv_length, const uchar* iv, uint8 iv_length,
uint noPadding); 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. AES decryption AES dynamic (defined at startup) encryption algorithm.
...@@ -107,7 +107,7 @@ typedef int (*my_aes_decrypt_dynamic_type)(const uchar *source, ...@@ -107,7 +107,7 @@ typedef int (*my_aes_decrypt_dynamic_type)(const uchar *source,
const uchar *key, uint8 key_length, const uchar *key, uint8 key_length,
const uchar *iv, uint8 iv_length, const uchar *iv, uint8 iv_length,
uint noPadding); 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 Initialize dynamic crypt functions
......
...@@ -472,5 +472,5 @@ ENDIF() ...@@ -472,5 +472,5 @@ ENDIF()
MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE
MODULE_ONLY MODULE_ONLY
MODULE_OUTPUT_NAME ha_innodb MODULE_OUTPUT_NAME ha_innodb
LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT} pcre pcreposix mysys_ssl) LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT} pcre pcreposix)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment