bzr push into mysql-5.5-bugfixing branch (magne.mahre:3107 to 3108) Bug#55001

[Magne Mahre]

 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
 3107 Konstantin Osipov	2010-08-13
      Bug#52117 "Pending FLUSH TALBES <list> aborts transactions unnecessarily"
      The bug was fixed by the patch for Bug 52044.
      Add a test case.
     @ mysql-test/r/flush.result
        Update results (Bug#52117)
     @ mysql-test/t/flush.test
        Add a test case for Bug#52117 "Pending FLUSH TALBES <list> aborts
        transactions unnecessarily"

    modified:
      mysql-test/r/flush.result
      mysql-test/t/flush.test
=== 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",


Attachment: [text/bzr-bundle] bzr/[e-mail]