Cleanup - do not dllexport statically built plugins

client/mysql.cc

@@ -4636,7 +4636,10 @@ static char *get_arg(char *line, get_arg_mode mode)
                         string, and the "dialog" plugin will free() it.
 */
 
-MYSQL_PLUGIN_EXPORT
+extern "C"
+#ifdef _MSC_VER
+__declspec(dllexport)
+#endif
 char *mysql_authentication_dialog_ask(MYSQL *mysql, int type,
                                       const char *prompt,
                                       char *buf, int buf_len)

client/mysqltest.cc

@@ -11282,7 +11282,10 @@ static int setenv(const char *name, const char *value, int overwrite)
   that always reads from stdin with explicit echo.
 
 */
-MYSQL_PLUGIN_EXPORT
+extern "C"
+#ifdef _MSC_VER
+__declspec(dllexport)
+#endif
 char *mysql_authentication_dialog_ask(MYSQL *mysql, int type,
                                       const char *prompt,
                                       char *buf, int buf_len)

include/mysql/plugin.h

@@ -23,18 +23,20 @@
   unlike other compilers, uses C++ mangling for variables not only
   for functions.
 */
-#if defined(_MSC_VER)
-  #ifdef __cplusplus
-    #define MYSQL_PLUGIN_EXPORT extern "C" __declspec(dllexport)
+#ifdef MYSQL_DYNAMIC_PLUGIN
+  #ifdef _MSC_VER
+    #define MYSQL_DLLEXPORT _declspec(dllexport)
   #else
-    #define MYSQL_PLUGIN_EXPORT __declspec(dllexport)
-  #endif
-#else /*_MSC_VER */
-  #ifdef __cplusplus
-    #define MYSQL_PLUGIN_EXPORT extern "C"
-  #else
-    #define MYSQL_PLUGIN_EXPORT
+    #define MYSQL_DLLEXPORT
   #endif
+#else
+  #define MYSQL_DLLEXPORT
+#endif
+
+#ifdef __cplusplus
+  #define MYSQL_PLUGIN_EXPORT extern "C" MYSQL_DLLEXPORT
+#else
+  #define MYSQL_PLUGIN_EXPORT MYSQL_DLLEXPORT
 #endif
 
 #ifdef __cplusplus