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

--===============5898037773316670860==
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 no platforms, 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 12:26:42 +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 12:26:42 +0000
@@ -1617,14 +1617,12 @@ 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
 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",


--===============5898037773316670860==
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: 792e6032740e40081efd31bd97c1ac5984dce721
# timestamp: 2010-08-16 14:26:48 +0200
# base_revision_id: kostja@stripped
# 
# Begin bundle
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
AA==


--===============5898037773316670860==--