diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-04-12 17:35:06 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-04-12 17:35:06 +0400 |
| commit | fe0828b3b8193e086abe740572c9b0cb2b7da671 (patch) | |
| tree | a7f511bb1291c983ab7f52170a21bbabad6684f6 /sql | |
| parent | 60333fbec9254056741a17d175611ca6eaebd1dd (diff) | |
| download | mariadb-git-fe0828b3b8193e086abe740572c9b0cb2b7da671.tar.gz | |
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).
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index f9d505e6223..2547100d8ff 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -184,7 +184,7 @@ extern ulong server_id, concurrency; extern time_t server_start_time, flush_status_time; extern char *opt_mysql_tmpdir, mysql_charsets_dir[]; 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 MYSQL_PLUGIN_IMPORT const char *my_localhost; extern MYSQL_PLUGIN_IMPORT const char **errmesg; /* Error messages */ |