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/sys_vars.cc | |
| parent | 5cb0ccebf3115d752a04b0eb4d2e153e3ac102f6 (diff) | |
| parent | 71553c2c9db3c4c27973f12461b986c59e1dabfb (diff) | |
| download | mariadb-git-cd347705585b99c242efaf63550ace6819610795.tar.gz | |
Merging with mysql-5.5-stage.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 320e6d9253e..9294c7b89a4 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1669,19 +1669,13 @@ static Sys_var_ulong Sys_trans_prealloc_size( static const char *thread_handling_names[]= { - "one-thread-per-connection", "no-threads", -#if HAVE_POOL_OF_THREADS == 1 - "pool-of-threads", -#endif + "one-thread-per-connection", "no-threads", "loaded-dynamically", 0 }; static Sys_var_enum Sys_thread_handling( "thread_handling", "Define threads usage for handling queries, one of " - "one-thread-per-connection, no-threads" -#if HAVE_POOL_OF_THREADS == 1 - ", pool-of-threads" -#endif + "one-thread-per-connection, no-threads, loaded-dynamically" , READ_ONLY GLOBAL_VAR(thread_handling), CMD_LINE(REQUIRED_ARG), thread_handling_names, DEFAULT(0)); |