From: Magne Mahre
Date: August 16 2010 1:05pm
Subject: bzr commit into mysql-5.5-bugfixing branch (magne.mahre:3108) Bug#55001
List-Archive: http://lists.mysql.com/commits/115788
X-Bug: 55001
Message-Id: <201008161305.o7GD5576016592@dm-uk-02.uk.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5954553744097433078=="

--===============5954553744097433078==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/tmp/x/mysql-5.5-runtime-55001/ based on revid:kostja@stripped

 3108 Magne Mahre	2010-08-16
      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.

    removed:
      mysql-test/include/have_thread_concurrency.inc
    modified:
      mysql-test/suite/sys_vars/t/thread_concurrency_basic.test
      sql/sys_vars.cc
=== removed file 'mysql-test/include/have_thread_concurrency.inc'
--- a/mysql-test/include/have_thread_concurrency.inc	2009-12-22 09:35:56 +0000
+++ b/mysql-test/include/have_thread_concurrency.inc	1970-01-01 00:00:00 +0000
@@ -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;

=== modified file 'mysql-test/suite/sys_vars/t/thread_concurrency_basic.test'
--- a/mysql-test/suite/sys_vars/t/thread_concurrency_basic.test	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/t/thread_concurrency_basic.test	2010-08-16 13:05:01 +0000
@@ -1,4 +1,3 @@
---source include/have_thread_concurrency.inc
 #
 # only global
 #

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-08-12 13:50:23 +0000
+++ b/sql/sys_vars.cc	2010-08-16 13:05:01 +0000
@@ -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",


--===============5954553744097433078==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magne.mahre@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magne.mahre@stripped
# target_branch: file:///export/home/tmp/x/mysql-5.5-runtime-55001/
# testament_sha1: 71c6f2f3f2c8ac72ffdd990773becc4a1d0ce3d8
# timestamp: 2010-08-16 15:05:04 +0200
# base_revision_id: kostja@stripped
# 
# Begin bundle
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


--===============5954553744097433078==--