diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-06-21 19:20:11 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-06-21 19:20:11 +0200 |
commit | 69f1a3215e5062eb6c06ed35ec38e1d824efbef6 (patch) | |
tree | a2f65c36cf7cf5254bb63389d1102ab53b0c805f /storage/connect | |
parent | 911af69d1e13e5dff43b550da19d3d4a0ae07e96 (diff) | |
download | mariadb-git-69f1a3215e5062eb6c06ed35ec38e1d824efbef6.tar.gz |
Replace dynamic loading of mysqld.exe data for plugins, replace with MYSQL_PLUGIN_IMPORT
Diffstat (limited to 'storage/connect')
-rw-r--r-- | storage/connect/mycat.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/storage/connect/mycat.cc b/storage/connect/mycat.cc index 97ad980dd6a..04cea59734e 100644 --- a/storage/connect/mycat.cc +++ b/storage/connect/mycat.cc @@ -105,19 +105,7 @@ PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char *tab, char *db, bool info); /***********************************************************************/ char *GetPluginDir(void) { - char *plugin_dir; - -#if defined(_WIN64) - plugin_dir = (char *)GetProcAddress(GetModuleHandle(NULL), - "?opt_plugin_dir@@3PADEA"); -#elif defined(_WIN32) - plugin_dir = (char*)GetProcAddress(GetModuleHandle(NULL), - "?opt_plugin_dir@@3PADA"); -#else - plugin_dir = opt_plugin_dir; -#endif - - return plugin_dir; + return opt_plugin_dir; } // end of GetPluginDir /***********************************************************************/ |