Commit 2283e1b5 authored by Alexander Nozdrin's avatar Alexander Nozdrin

Fix compile error (different storage class for mysql_temp_dir_list)

when trying to build innodb as plugin.

The reason for the error is mismatch in mysql_temp_dir_list
declaration between mysqld.h and usage in ha_innodb.cc

Add missing MYSQL_PLUGIN_IMPORT to mysql_tmpdir_list
(variables exported by the server and used by plugin need it).
parent 50ff4515
...@@ -184,7 +184,7 @@ extern ulong server_id, concurrency; ...@@ -184,7 +184,7 @@ extern ulong server_id, concurrency;
extern time_t server_start_time, flush_status_time; extern time_t server_start_time, flush_status_time;
extern char *opt_mysql_tmpdir, mysql_charsets_dir[]; extern char *opt_mysql_tmpdir, mysql_charsets_dir[];
extern int mysql_unpacked_real_data_home_len; extern int mysql_unpacked_real_data_home_len;
extern MY_TMPDIR mysql_tmpdir_list; extern MYSQL_PLUGIN_IMPORT MY_TMPDIR mysql_tmpdir_list;
extern const char *first_keyword, *delayed_user, *binary_keyword; extern const char *first_keyword, *delayed_user, *binary_keyword;
extern MYSQL_PLUGIN_IMPORT const char *my_localhost; extern MYSQL_PLUGIN_IMPORT const char *my_localhost;
extern MYSQL_PLUGIN_IMPORT const char **errmesg; /* Error messages */ extern MYSQL_PLUGIN_IMPORT const char **errmesg; /* Error messages */
......
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