This belongs to the fix for

Bug#42003 tests missing the disconnect of connections <> default
second slice
Content:
1. wait_until_count_sessions.inc
   - One PB run of a test using this routine failed because
     5 seconds timeout were exceeded. Although I have some doubts
     if the assigned timeout was really too small, I increase the
     value to 10. We waste the additional 5 seconds only if the
     tests fails anyway.
   - Print the content of the PROCESSLIST if the poll routine fails
2. minor improvements of formatting
3. query_cache_notembedded:
   Activate the wait_until_count_sessions.inc routine which was
   unfortunately forgotten in the changeset before.

mysql-test/include/wait_until_count_sessions.inc

@@ -82,7 +82,7 @@
 # Created: 2009-01-14 mleich
 #
 
-let $wait_counter= 50;
+let $wait_counter= 100;
 if ($wait_timeout)
 {
    let $wait_counter= `SELECT $wait_timeout * 10`;
@@ -108,5 +108,6 @@ if (!$success)
 {
    --echo # Timeout in wait_until_count_sessions.inc
    --echo # Number of sessions   expected: $count_sessions   found: $current_sessions
+   SHOW PROCESSLIST;
 }
 

mysql-test/r/information_schema.result

@@ -1027,7 +1027,7 @@ BEGIN
 SELECT 'foo' FROM DUAL;
 END |
 ERROR 42000: Unknown database 'information_schema'
-select  ROUTINE_NAME from routines;
+select ROUTINE_NAME from routines;
 ROUTINE_NAME
 grant all on information_schema.* to 'user1'@'localhost';
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

mysql-test/r/subselect.result

@@ -4407,7 +4407,7 @@ pk	a
 3	30
 2	20
 DROP TABLE t1,t2;
-CREATE TABLE t1 (s1 char(1));
+CREATE TABLE t1 (s1 CHAR(1));
 INSERT INTO t1 VALUES ('a');
 SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);
 s1

mysql-test/t/grant.test

@@ -204,7 +204,7 @@ show grants for mysqltest_1@localhost;
 drop user mysqltest_1@localhost;
 
 #
-# Bug#3403 Wrong encoding in SHOW GRANTS, EPLAIN SELECT output
+# Bug#3403 Wrong encoding in SHOW GRANTS, EXPLAIN SELECT output
 #
 SET NAMES koi8r;
 CREATE DATABASE <20><>;
@@ -384,7 +384,7 @@ update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
 update mysqltest_2.t1, mysqltest_1.t2 set c=100,b=200;
 --error ER_TABLEACCESS_DENIED_ERROR
 update mysqltest_1.t1, mysqltest_2.t2 set a=100,d=200;
-#lets see the result
+# lets see the result
 connection master;
 select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
 select t1.*,t2.* from mysqltest_2.t1,mysqltest_2.t2;
@@ -784,7 +784,6 @@ SHOW CREATE VIEW mysqltest2.v_yy;
 # succeed, have SELECT and SHOW VIEW
 SHOW CREATE TABLE mysqltest2.v_yy;
 
-
 # clean-up
 connection master;
 

mysql-test/t/information_schema.test

@@ -676,7 +676,7 @@ drop table t1;
 
 #
 # Bug#12636 SHOW TABLE STATUS with where condition containing a subquery
-#             over information schema
+#           over information schema
 #
 
 CREATE TABLE t1 (a int);
@@ -729,7 +729,7 @@ BEGIN
   SELECT 'foo' FROM DUAL;
 END |
 delimiter ;|
-select  ROUTINE_NAME from routines;
+select ROUTINE_NAME from routines;
 #
 # Bug#10734 Grant of privileges other than 'select' and 'create view' should fail on schema
 #
@@ -980,9 +980,6 @@ SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT), COLUMN_DEFAULT=
 DROP TABLE bug23037;
 DROP FUNCTION get_value;
 
-
-
-
 #
 # Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash
 #

mysql-test/t/query_cache_notembedded.test

@@ -262,4 +262,4 @@ SET GLOBAL query_cache_size= default;
 # End of 5.0 tests
 
 # Wait till we reached the initial number of concurrent sessions
-#--source include/wait_until_count_sessions.inc
+--source include/wait_until_count_sessions.inc

mysql-test/t/subselect.test

@@ -367,7 +367,7 @@ let $wait_condition= SELECT COUNT(*) <> $row_count_before FROM t1;
 --source include/wait_condition.inc
 select * from t1;
 #
-#TODO: should be uncommented after bug 380 fix pushed
+#TODO: should be uncommented after Bug#380 fix pushed
 #INSERT INTO t1 (x) SELECT (SELECT SUM(a)+b FROM t2) from t3;
 #select * from t1;
 drop table t1, t2, t3;
@@ -2031,7 +2031,7 @@ DROP TABLE t1,t2,t3;
 
 
 #
-# Bug24670 subquery witout tables but with a WHERE clause
+# Bug#24670 subquery witout tables but with a WHERE clause
 #
 
 CREATE TABLE t1 (a int);
@@ -2567,7 +2567,7 @@ DROP TABLE t1;
 
 #
 # Bug#21540 Subqueries with no from and aggregate functions return
-#              wrong results
+#           wrong results
 CREATE TABLE t1 (a INT, b INT);
 CREATE TABLE t2 (a INT);
 INSERT INTO t2 values (1);
@@ -3379,7 +3379,7 @@ DROP TABLE t1,t2;
 #
 # Bug#20835 (literal string with =any values)
 #
-CREATE TABLE t1 (s1 char(1));
+CREATE TABLE t1 (s1 CHAR(1));
 INSERT INTO t1 VALUES ('a');
 SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);
 DROP TABLE t1;
@@ -3409,13 +3409,13 @@ INSERT INTO t1 (id) VALUES (1);
 INSERT INTO t2 (id) VALUES (1);
 
 CREATE VIEW v1 AS
-  SELECT t2.c AS c FROM t1, t2
- WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+SELECT t2.c AS c FROM t1, t2
+WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
 UPDATE v1 SET c=1;
 
 CREATE VIEW v2 (a,b) AS
-  SELECT t2.id, t2.c AS c FROM t1, t2
- WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+SELECT t2.id, t2.c AS c FROM t1, t2
+WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
 
 --error ER_VIEW_CHECK_FAILED
 INSERT INTO v2(a,b) VALUES (2,2);
@@ -3423,8 +3423,8 @@ INSERT INTO v2(a,b) VALUES (1,2);
 SELECT * FROM v1;
 
 CREATE VIEW v3 AS
-  SELECT t2.c AS c FROM t2
- WHERE 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+SELECT t2.c AS c FROM t2
+WHERE 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
 
 DELETE FROM v3;