bzr commit into mysql-5.1 branch (horst:2735) Bug#36733

[Horst Hunger]

#At file:///work/bzr/mysql-5.1-sys-var/

 2735 Horst Hunger	2008-09-11
      Changes as result of the 1. review for Bug#36733.
modified:
  mysql-test/r/thread_cache_size_func.result
  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-08-28 14:43:13 +0000
+++ b/mysql-test/r/thread_cache_size_func.result	2008-09-11 08:15:23 +0000
@@ -6,16 +6,15 @@ SHOW STATUS LIKE 'Threads_cached';
 Variable_name	Value
 Threads_cached	0
 0 Expected
-'#Old value for thread_cache'#
 ** Connecting conn1 using username 'root' **
 ** Connecting conn2 using username 'root' **
 ** Connecting conn3 using username 'root' **
 ** Connecting conn4 using username 'root' **
+** Connection default **
 SHOW STATUS LIKE 'Threads_cached';
 Variable_name	Value
 Threads_cached	0
 0 Expected
-** Connection default **
 ** Disconnecting conn1,conn2,conn3,conn4 **
 SHOW STATUS LIKE 'Threads_cached';
 Variable_name	Value
@@ -24,7 +23,7 @@ Threads_cached	3
 SET @@GLOBAL.thread_cache_size= 1;
 ** Connecting conn1 using username 'root' **
 ** Connecting conn2 using username 'root' **
-** Connection default **
+connection default;
 ** Disconnecting conn1,conn2 **
 SHOW STATUS LIKE 'Threads_cached';
 Variable_name	Value

=== modified file 'mysql-test/t/thread_cache_size_func.test'
--- a/mysql-test/t/thread_cache_size_func.test	2008-08-28 14:43:13 +0000
+++ b/mysql-test/t/thread_cache_size_func.test	2008-09-11 08:15:23 +0000
@@ -33,28 +33,26 @@ SET @global_thread_cache_size = @@GLOBAL
 
 FLUSH STATUS;
 
-#
-# Greater than cache threads, setting cache size to 3
-#
 -- ECHO '# Test1#'
 SET @@GLOBAL.thread_cache_size=3;
 SHOW STATUS LIKE 'Threads_cached';
 --echo 0 Expected
 
---echo '#Old value for thread_cache'#
-
 ##################################
 # Make 4 connections             #
 ##################################
 
 --echo ** Connecting conn1 using username 'root' **
-connect (conn1,localhost,root,,);
+CONNECT (conn1,localhost,root,,);
 --echo ** Connecting conn2 using username 'root' **
-connect (conn2,localhost,root,,);
+CONNECT (conn2,localhost,root,,);
 --echo ** Connecting conn3 using username 'root' **
-connect (conn3,localhost,root,,);
+CONNECT (conn3,localhost,root,,);
 --echo ** Connecting conn4 using username 'root' **
-connect (conn4,localhost,root,,);
+CONNECT (conn4,localhost,root,,);
+
+--echo ** Connection default **
+CONNECTION default;
 
 # Wait until all connections done
 let $wait_condition= SELECT COUNT(*)= 5 FROM INFORMATION_SCHEMA.PROCESSLIST;
@@ -67,14 +65,11 @@ SHOW STATUS LIKE 'Threads_cached';
 #Disconnecting all the connections #
 ####################################
 
---echo ** Connection default **
-connection default;
-
 --echo ** Disconnecting conn1,conn2,conn3,conn4 **
-disconnect conn1;
-disconnect conn2;
-disconnect conn3;
-disconnect conn4;
+DISCONNECT conn1;
+DISCONNECT conn2;
+DISCONNECT conn3;
+DISCONNECT conn4;
 
 #
 # Checking the status
@@ -92,23 +87,21 @@ SHOW STATUS LIKE 'Threads_cached';
 #
 SET @@GLOBAL.thread_cache_size= 1;
 
-connection default;
-
 --echo ** Connecting conn1 using username 'root' **
 CONNECT (conn1,localhost,root,,);
 --echo ** Connecting conn2 using username 'root' **
 CONNECT (conn2,localhost,root,,);
 
+--echo connection default;
+CONNECTION default;
+
 # 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;
-
 --echo ** Disconnecting conn1,conn2 **
-disconnect conn1;
-disconnect conn2;
+DISCONNECT conn1;
+DISCONNECT conn2;
 
 # Wait until all disconnects ready
 let $wait_condition= SELECT COUNT(*)= 1 FROM INFORMATION_SCHEMA.PROCESSLIST;