bzr commit into mysql-6.0-bugteam branch (horst:2751) Bug#40574

[Horst Hunger]

#At file:///work/bzr/mysql-6.0-bug/

 2751 Horst Hunger	2008-12-04
      Fix for Bug#40574: testing the thread per connection make only sense if that thread handling is set. In all other cases the must be skipped.
added:
  mysql-test/include/have_one-thread-per-connection.inc
modified:
  mysql-test/t/disabled.def
  mysql-test/t/thread_cache_size_func.test

=== added file 'mysql-test/include/have_one-thread-per-connection.inc'
--- a/mysql-test/include/have_one-thread-per-connection.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/have_one-thread-per-connection.inc	2008-12-04 11:29:04 +0000
@@ -0,0 +1,11 @@
+# Created 2008-12-04 HHunger
+# Check the System variable "thread_handling".
+--disable_query_log
+# Check if thread_handling= one-thread-per-connection
+let $no_needed_threads= `SELECT @@GLOBAL.thread_handling != 'one-thread-per-connection'`;
+if ($no_needed_threads)
+{
+  skip Test needs thread_handling=one-thread-per-connection;
+}
+--enable_query_log
+

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2008-12-04 09:49:59 +0000
+++ b/mysql-test/t/disabled.def	2008-12-04 11:29:04 +0000
@@ -35,5 +35,5 @@ tmp_table_size_basic_32     : Bug#36878 
 backup_triggers_and_events  : Bug#37762 2008-07-01 rafal Test fails on remove_file for unknown reasons
 backup_no_be                : Bug#38023 2008-07-16 rafal Test triggers valgrind warnings described in the bug
 user_limits                 : Bug#23921 2008-07-25 joro random failure of user_limits.test
-thread_cache_size_func      : Bug#40574 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
+#thread_cache_size_func      : Bug#40574 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
 

=== modified file 'mysql-test/t/thread_cache_size_func.test'
--- a/mysql-test/t/thread_cache_size_func.test	2008-10-15 18:58:53 +0000
+++ b/mysql-test/t/thread_cache_size_func.test	2008-12-04 11:29:04 +0000
@@ -29,6 +29,8 @@
 
 --source include/not_embedded.inc
 
+--source include/have_one-thread-per-connection.inc
+
 SET @global_thread_cache_size = @@GLOBAL.thread_cache_size;
 
 FLUSH STATUS;