diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-12 22:33:30 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-15 22:14:33 +0100 |
| commit | 985ef1d42a7b71c72aa3b26d96f0876ac597522f (patch) | |
| tree | da8f09a60b5cb0323987d550c204ebab52eb8dab | |
| parent | 4c9d0b2b0cfb3032382c40cc8a31e1c637279dbc (diff) | |
| download | mariadb-git-985ef1d42a7b71c72aa3b26d96f0876ac597522f.tar.gz | |
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.
| -rw-r--r-- | include/my_aes.h | 4 | ||||
| -rw-r--r-- | storage/innobase/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/my_aes.h b/include/my_aes.h index 1616d79d70a..db50d35efd5 100644 --- 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 index e3e1e70feb7..628aa5f6d45 100644 --- 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) |