diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-24 09:38:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-24 09:38:49 +0300 |
| commit | 1864a8ea93aa1d1a540c83526a25df2ad0330763 (patch) | |
| tree | f6d1ae8e9e696ea8537a395d061f697e5bccd4aa /sql/mysqld.h | |
| parent | b01a9fd817d9d8e5941008d6981338eaa7369c83 (diff) | |
| parent | 5c75ba9cadc7877e91d6b712f157ff5623c09c60 (diff) | |
| download | mariadb-git-1864a8ea93aa1d1a540c83526a25df2ad0330763.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/mysqld.h')
| -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 47f19b76c93..4f6709f37f4 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -582,7 +582,7 @@ extern ulonglong my_pcre_frame_size; */ extern my_bool opt_large_pages; extern uint opt_large_page_size; -extern char lc_messages_dir[FN_REFLEN]; +extern MYSQL_PLUGIN_IMPORT char lc_messages_dir[FN_REFLEN]; extern char *lc_messages_dir_ptr, *log_error_file_ptr; extern MYSQL_PLUGIN_IMPORT char reg_ext[FN_EXTLEN]; extern MYSQL_PLUGIN_IMPORT uint reg_ext_length; |