#At file:///work/bzr/mysql-5.1-sys-var/
2729 Horst Hunger 2008-08-28
Fix for bug#36733: Replaced sleeps by polling and reduced test to needed code.
modified:
mysql-test/r/thread_cache_size_func.result
mysql-test/t/disabled.def
mysql-test/t/thread_cache_size_func.test
=== modified file 'mysql-test/r/thread_cache_size_func.result'
--- a/mysql-test/r/thread_cache_size_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/thread_cache_size_func.result 2008-08-28 14:43:13 +0000
@@ -2,7 +2,6 @@ SET @global_thread_cache_size = @@GLOBAL
FLUSH STATUS;
'# Test1#'
SET @@GLOBAL.thread_cache_size=3;
-Saving threads cached, threads created values
SHOW STATUS LIKE 'Threads_cached';
Variable_name Value
Threads_cached 0
@@ -12,57 +11,23 @@ Threads_cached 0
** Connecting conn2 using username 'root' **
** Connecting conn3 using username 'root' **
** Connecting conn4 using username 'root' **
-Saving threads cached, threads created values
-Threads Created Difference
-4
-4 Expected
SHOW STATUS LIKE 'Threads_cached';
Variable_name Value
Threads_cached 0
0 Expected
** Connection default **
** Disconnecting conn1,conn2,conn3,conn4 **
-'#new values for thread cache after disconnecting'#
-Saving threads cached, threads created values
-Threads Created Difference
-0
-0 Expected
SHOW STATUS LIKE 'Threads_cached';
Variable_name Value
Threads_cached 3
3 Expected
-SET @@GLOBAL.thread_cache_size=1;
-Saving threads cached, threads created values
-Threads Created Difference
-0
-0 Expected
-SHOW STATUS LIKE 'Threads_cached';
-Variable_name Value
-Threads_cached 3
-1 Expected
-Bug: The number of threads cached should have decreased with cache size decrease.
+SET @@GLOBAL.thread_cache_size= 1;
** Connecting conn1 using username 'root' **
** Connecting conn2 using username 'root' **
-Saving threads cached, threads created values
-Threads Created Difference
-0
-1 Expected
-Bug: The number of threads created should have increased because the cache should have 1 thread only
-SHOW STATUS LIKE 'Threads_cached';
-Variable_name Value
-Threads_cached 1
-0 Expected
-Bug: The number of threads created should have decreased because atleast 1 new connection came in
** Connection default **
** Disconnecting conn1,conn2 **
-'#new status values for thread cache'#
-Saving threads cached, threads created values
-Threads Created Difference
-0
-0 Expected
SHOW STATUS LIKE 'Threads_cached';
Variable_name Value
Threads_cached 1
1 Expected
-Saving threads cached, threads created values
SET @@GLOBAL.thread_cache_size = @global_thread_cache_size;
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def 2008-07-22 17:00:27 +0000
+++ b/mysql-test/t/disabled.def 2008-08-28 14:43:13 +0000
@@ -11,7 +11,6 @@
##############################################################################
federated_transactions : Bug#29523 Transactions do not work
csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
-thread_cache_size_func : Bug#36733 main.thread_cache_size_func fails randomly
log_tables.test : Bug #37798: main.log_tables fails randomly on powermacg5 and windows
slow_query_log_func.test : Bug #37962: *_func tests containing sleeps/race conditions
=== modified file 'mysql-test/t/thread_cache_size_func.test'
--- a/mysql-test/t/thread_cache_size_func.test 2008-04-11 19:59:33 +0000
+++ b/mysql-test/t/thread_cache_size_func.test 2008-08-28 14:43:13 +0000
@@ -1,26 +1,27 @@
-############# mysql-test\t\thread_cache_size_func.test #######################################
-# #
-# Variable Name: thread_cache_size #
-# Scope: SESSION #
-# Access Type: Dynamic #
-# Data Type: Enumeration #
-# Default Value: 0 #
-# Values: 0-16384 #
-# #
-# #
-# Creation Date: 2008-03-02 #
-# Author: Sharique Abdullah #
-# #
-# Description: Test Cases of Dynamic System Variable "thread_cache_size" #
-# that checks behavior of this variable in the following ways #
-# * Functionality based on different values #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
-# option_mysqld_thread_cache_size #
-# #
-#########################################################################################
-
-
+############# mysql-test\t\thread_cache_size_func.test ##########################
+# #
+# Variable Name: thread_cache_size #
+# Scope: SESSION #
+# Access Type: Dynamic #
+# Data Type: Enumeration #
+# Default Value: 0 #
+# Values: 0-16384 #
+# #
+# #
+# Creation Date: 2008-03-02 #
+# Author: Sharique Abdullah #
+# #
+# Modified: HHunger 2008-08-27 Reduced test to needed function and inserted #
+# wait-loops #
+# #
+# Description: Test Cases of Dynamic System Variable "thread_cache_size" #
+# that checks behavior of this variable in the following ways #
+# * Functionality based on different values #
+# #
+# Reference: #
+# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
+# #
+#################################################################################
#
# Setup
@@ -37,14 +38,10 @@ FLUSH STATUS;
#
-- ECHO '# Test1#'
SET @@GLOBAL.thread_cache_size=3;
-
-let $threadsCreated1 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
---echo Saving threads cached, threads created values
-
SHOW STATUS LIKE 'Threads_cached';
--echo 0 Expected
---ECHO '#Old value for thread_cache'#
+--echo '#Old value for thread_cache'#
##################################
# Make 4 connections #
@@ -59,14 +56,10 @@ connect (conn3,localhost,root,,);
--echo ** Connecting conn4 using username 'root' **
connect (conn4,localhost,root,,);
-let $threadsCreated2 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
---echo Saving threads cached, threads created values
-
---disable_query_log
-eval SELECT ($threadsCreated2 - $threadsCreated1) AS 'Threads Created Difference';
---enable_query_log
+# Wait until all connections done
+let $wait_condition= SELECT COUNT(*)= 5 FROM INFORMATION_SCHEMA.PROCESSLIST;
+--source include/wait_condition.inc
---echo 4 Expected
SHOW STATUS LIKE 'Threads_cached';
--echo 0 Expected
@@ -87,50 +80,28 @@ disconnect conn4;
# Checking the status
#
---echo '#new values for thread cache after disconnecting'#
-let $threadsCreated3 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
+# Wait until all disconnects ready
+let $wait_condition= SELECT COUNT(*)= 1 FROM INFORMATION_SCHEMA.PROCESSLIST;
+--source include/wait_condition.inc
---echo Saving threads cached, threads created values
---disable_query_log
-eval SELECT ($threadsCreated3 - $threadsCreated2) AS 'Threads Created Difference';
---enable_query_log
---echo 0 Expected
SHOW STATUS LIKE 'Threads_cached';
--echo 3 Expected
-
#
# Decreasing cache size to 1
#
-SET @@GLOBAL.thread_cache_size=1;
+SET @@GLOBAL.thread_cache_size= 1;
connection default;
-let $threadsCreated6 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
---echo Saving threads cached, threads created values
---disable_query_log
-eval SELECT $threadsCreated6 - $threadsCreated3 AS 'Threads Created Difference';
---enable_query_log
---echo 0 Expected
-SHOW STATUS LIKE 'Threads_cached';
---echo 1 Expected
---echo Bug: The number of threads cached should have decreased with cache size decrease.
-
--echo ** Connecting conn1 using username 'root' **
CONNECT (conn1,localhost,root,,);
--echo ** Connecting conn2 using username 'root' **
CONNECT (conn2,localhost,root,,);
-let $threadsCreated4 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
---echo Saving threads cached, threads created values
---disable_query_log
-eval SELECT $threadsCreated4 - $threadsCreated3 AS 'Threads Created Difference';
---enable_query_log
---echo 1 Expected
---echo Bug: The number of threads created should have increased because the cache should have 1 thread only
-SHOW STATUS LIKE 'Threads_cached';
---echo 0 Expected
---echo Bug: The number of threads created should have decreased because atleast 1 new connection came in
+# Wait until all connects ready
+let $wait_condition= SELECT COUNT(*)= 3 FROM INFORMATION_SCHEMA.PROCESSLIST;
+--source include/wait_condition.inc
--echo ** Connection default **
connection default;
@@ -139,20 +110,16 @@ connection default;
disconnect conn1;
disconnect conn2;
---ECHO '#new status values for thread cache'#
-let $threadsCreated5 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
---echo Saving threads cached, threads created values
---disable_query_log
-eval SELECT ($threadsCreated5 - $threadsCreated4) AS 'Threads Created Difference';
---enable_query_log
---echo 0 Expected
+# Wait until all disconnects ready
+let $wait_condition= SELECT COUNT(*)= 1 FROM INFORMATION_SCHEMA.PROCESSLIST;
+--source include/wait_condition.inc
+
SHOW STATUS LIKE 'Threads_cached';
--echo 1 Expected
---echo Saving threads cached, threads created values
-
#
# Cleanup
#
SET @@GLOBAL.thread_cache_size = @global_thread_cache_size;
+
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (horst:2729) Bug#36733 | Horst Hunger | 28 Aug |
