diff options
| author | Mats Kindahl <mats.kindahl@oracle.com> | 2010-08-16 14:50:27 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats.kindahl@oracle.com> | 2010-08-16 14:50:27 +0200 |
| commit | cd347705585b99c242efaf63550ace6819610795 (patch) | |
| tree | 60ab98cb19a6a71445b167b4cbc5308f59767cc9 /sql/mysqld.h | |
| parent | 5cb0ccebf3115d752a04b0eb4d2e153e3ac102f6 (diff) | |
| parent | 71553c2c9db3c4c27973f12461b986c59e1dabfb (diff) | |
| download | mariadb-git-cd347705585b99c242efaf63550ace6819610795.tar.gz | |
Merging with mysql-5.5-stage.
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 22e757e6e8a..2dc854134c7 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -175,7 +175,7 @@ extern ulong binlog_cache_size, open_files_limit; extern ulonglong max_binlog_cache_size; extern ulong max_binlog_size, max_relay_log_size; extern ulong opt_binlog_rows_event_max_size; -extern ulong rpl_recovery_rank, thread_cache_size, thread_pool_size; +extern ulong rpl_recovery_rank, thread_cache_size; extern ulong back_log; extern char language[FN_REFLEN]; extern ulong server_id, concurrency; @@ -207,7 +207,7 @@ extern my_bool old_mode; extern LEX_STRING opt_init_connect, opt_init_slave; extern int bootstrap_error; extern I_List<THD> threads; -extern scheduler_functions thread_scheduler; +extern char err_shared_dir[]; extern TYPELIB thread_handling_typelib; extern my_decimal decimal_zero; |