From a3b9557b3aee40df2671ca6d828d6f7abde4b467 Mon Sep 17 00:00:00 2001 From: Magne Mahre Date: Mon, 16 Aug 2010 15:05:01 +0200 Subject: [PATCH] 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. --- mysql-test/include/have_thread_concurrency.inc | 10 ---------- .../suite/sys_vars/t/thread_concurrency_basic.test | 1 - sql/sys_vars.cc | 7 +++++-- 3 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 mysql-test/include/have_thread_concurrency.inc diff --git a/mysql-test/include/have_thread_concurrency.inc b/mysql-test/include/have_thread_concurrency.inc deleted file mode 100644 index 730edbf4895..00000000000 --- a/mysql-test/include/have_thread_concurrency.inc +++ /dev/null @@ -1,10 +0,0 @@ -disable_query_log; -disable_result_log; -set @have_thread_concurrency=0; -select @have_thread_concurrency:=1 from information_schema.global_variables where variable_name='thread_concurrency'; -if (`select @have_thread_concurrency = 0`) -{ - skip Need @@thread_concurrency; -} -enable_result_log; -enable_query_log; diff --git a/mysql-test/suite/sys_vars/t/thread_concurrency_basic.test b/mysql-test/suite/sys_vars/t/thread_concurrency_basic.test index d4acc961752..6d4ca3e2b4d 100644 --- a/mysql-test/suite/sys_vars/t/thread_concurrency_basic.test +++ b/mysql-test/suite/sys_vars/t/thread_concurrency_basic.test @@ -1,4 +1,3 @@ ---source include/have_thread_concurrency.inc # # only global # 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",