Last slice of fix for Bug#42003 tests missing the disconnect of connections <> default

+ Fix for Bug#43114 wait_until_count_sessions too restrictive, random PB failures
+ Removal of a lot of other weaknesses found
+ modifications according to review

1 files changed, 15 insertions, 10 deletions

diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 5856bfff036..a4ad44d1e7e 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -6,6 +6,9 @@
 # This test uses chmod, can't be run with root permissions
 -- source include/not_as_root.inc
 
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
 # ============================================================================
 #
 # Test of mysqltest itself
@@ -50,7 +53,7 @@ select otto from (select 1 as otto) as t1;
 
 # ----------------------------------------------------------------------------
 # Negative case(statement):
-# The derived table t1 does not contain a column named 'friedrich' . 
+# The derived table t1 does not contain a column named 'friedrich' .
 # --> ERROR 42S22: Unknown column 'friedrich' in 'field list and
 # --> 1054: Unknown column 'friedrich' in 'field list'
 # ----------------------------------------------------------------------------
@@ -116,7 +119,7 @@ select friedrich from (select 1 as otto) as t1;
 # $mysql_errno is a builtin variable of mysqltest and contains the return code
 # of the last command sent to the server.
 #
-#      The following test cases often initialize $mysql_errno to 1064 by 
+#      The following test cases often initialize $mysql_errno to 1064 by
 #      a command with wrong syntax.
 #      Example: --error 1064      To prevent the abort after the error.
 #               garbage ;
@@ -454,7 +457,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
 
 # Allow trailing # comment
 --sleep 1 # Wait for insert delayed to be executed.
---sleep 1 	 # Wait for insert delayed to be executed.
+--sleep 1        # Wait for insert delayed to be executed.
 
 # ----------------------------------------------------------------------------
 # Test error
@@ -1360,7 +1363,7 @@ connection default;
 
 
 # ----------------------------------------------------------------------------
-# TODO Test queries, especially their errormessages... so it's easy to debug 
+# TODO Test queries, especially their errormessages... so it's easy to debug
 # new scripts and diagnose errors
 # ----------------------------------------------------------------------------
 
@@ -1401,7 +1404,7 @@ let $message= `SELECT USER()`;
 
 # The message contains more then 80 characters on multiple lines
 # and is kept between double quotes.
-let $message= 
+let $message=
 "Here comes a very very long message that
     - is longer then 80 characters    and
     - consists of several lines";
@@ -1436,7 +1439,7 @@ select "this will be executed";
 
 remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.result;
 --error 0,1
-remove_file $MYSQLTEST_VARDIR/log/zero_length_file.reject;
+remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.reject;
 --error 0,1
 remove_file $MYSQL_TEST_DIR/r/zero_length_file.reject;
 
@@ -1510,7 +1513,7 @@ remove_file $MYSQLTEST_VARDIR/log/bug11731.log;
 remove_file $MYSQLTEST_VARDIR/tmp/bug11731.sql;
 
 #
-# Bug#19890  	mysqltest: "query" command is broken
+# Bug#19890 mysqltest: "query" command is broken
 #
 
 # It should be possible to use the command "query" to force mysqltest to
@@ -1533,7 +1536,7 @@ select "at" as col1, "c" as col2;
 select "at" as col1, "AT" as col2, "c" as col3;
 
 --replace_regex /a/b/ /ct/d/
-select "a" as col1, "ct" as col2; 
+select "a" as col1, "ct" as col2;
 
 --replace_regex /(strawberry)/raspberry and \1/ /blueberry/blackberry/ /potato/tomato/;
 select "strawberry","blueberry","potato";
@@ -1551,7 +1554,7 @@ select "strawberry","blueberry","potato";
 --error 1
 --exec echo "--replace_regex /a b c" | $MYSQL_TEST 2>&1
 --error 1
---exec echo "replace_regex /a /b c ;" | $MYSQL_TEST 2>&1 
+--exec echo "replace_regex /a /b c ;" | $MYSQL_TEST 2>&1
 
 # REQUIREMENT
 #   replace_regex should replace substitutions from left to right in output
@@ -1920,7 +1923,7 @@ SELECT '2' as "my_col1",2 as "my_col2"
 UNION
 SELECT '1',1 from t2;
 
-# 9. Ensure that several result formatting options including "sorted_result" 
+# 9. Ensure that several result formatting options including "sorted_result"
 #    - have all an effect
 #    - "--sorted_result" does not need to be direct before the statement
 #    - Row sorting is applied after modification of the column content
@@ -2126,3 +2129,5 @@ rmdir $MYSQLTEST_VARDIR/tmp/testdir;
 
 --echo End of tests
 
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc