diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-12 22:14:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-12 22:14:59 +0300 |
| commit | 15419a558370aeed9521b498c34d50f20a8d47a5 (patch) | |
| tree | cd15d32e9b61f297d8fafb048df85d9148951eb2 /sql/mysqld.h | |
| parent | 5e84ea9634ac491f3da84f6c15987d4c1b1a5a3a (diff) | |
| parent | 77867c147b8a278977203ad33d7daff0587a112a (diff) | |
| download | mariadb-git-15419a558370aeed9521b498c34d50f20a8d47a5.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 2e829e81a0d..4a392eaf196 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -241,7 +241,7 @@ extern int max_user_connections; extern volatile ulong cached_thread_count; extern ulong what_to_log,flush_time; extern uint max_prepared_stmt_count, prepared_stmt_count; -extern ulong open_files_limit; +extern MYSQL_PLUGIN_IMPORT ulong open_files_limit; extern ulonglong binlog_cache_size, binlog_stmt_cache_size, binlog_file_cache_size; extern ulonglong max_binlog_cache_size, max_binlog_stmt_cache_size; extern ulong max_binlog_size; |