summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@sun.com>2010-08-16 15:05:01 +0200
committerMagne Mahre <magne.mahre@sun.com>2010-08-16 15:05:01 +0200
commita3b9557b3aee40df2671ca6d828d6f7abde4b467 (patch)
tree750f33a4a7b90c489c5a61e8350a8cb5d6175d56 /sql/sys_vars.cc
parent5c7ac4aa7abcc41f09e226162e3c03faa6207c94 (diff)
downloadmariadb-git-a3b9557b3aee40df2671ca6d828d6f7abde4b467.tar.gz
Bug#55001 Change in behavior: thread_concurrency (docs,
example files) The system variable 'thread_concurrency' has been (re-)enabled on all platforms, to prevent startup errors. 'thread_concurrency' is unused and has no effect, on any platform, in MySQL 5.1 and later versions. It will be deprecated, and removed, in context of worklog WL#5265 mysql-test/include/have_thread_concurrency.inc: include/have_thread_concurrency.inc was only needed to support platforms that didn't have the thread_concurrency variable available. Since the variable is now available on all platforms, the file is removed.
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 13d1e646f04..fdda514986b 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -1617,14 +1617,17 @@ static Sys_var_charptr Sys_socket(
READ_ONLY GLOBAL_VAR(mysqld_unix_port), CMD_LINE(REQUIRED_ARG),
IN_FS_CHARSET, DEFAULT(0));
-#ifdef HAVE_THR_SETCONCURRENCY
+/*
+ thread_concurrency is a no-op on all platforms since
+ MySQL 5.1. It will be removed in the context of
+ WL#5265
+*/
static Sys_var_ulong Sys_thread_concurrency(
"thread_concurrency",
"Permits the application to give the threads system a hint for "
"the desired number of threads that should be run at the same time",
READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1));
-#endif
static Sys_var_ulong Sys_thread_stack(
"thread_stack", "The stack size for each thread",