diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2018-05-07 21:38:18 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2018-05-07 21:38:18 +0300 |
| commit | dbe73588cd82dc6b6547425e7233b7899f61dfd5 (patch) | |
| tree | b64bdea6c90446476d40fd8a477c522d2c499cea /sql/mysqld.h | |
| parent | e44ca6cc9c300cbdf93c64110bd8cf2be8125379 (diff) | |
| parent | 03edf2ed04dbffe8c413fe0dd2715684e1627371 (diff) | |
| download | mariadb-git-dbe73588cd82dc6b6547425e7233b7899f61dfd5.tar.gz | |
Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2
Manually resolved the conflicts
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 74e4f1ecb43..5a2dc6dce8d 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -209,7 +209,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; extern ulonglong max_binlog_cache_size, max_binlog_stmt_cache_size; extern ulong max_binlog_size; |