mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
2. Slice of fix for Bug#42003 tests missing the disconnect of connections <> default
- If missing: add "disconnect <session>"
- If physical disconnect of non "default" sessions is not finished
at test end: add routine which waits till this happened
+ additional improvements
- remove superfluous files created by the test
- replace error numbers by error names
- remove trailing spaces, replace tabs by spaces
- unify writing of bugs within comments
- correct comments
- minor changes of formatting
Fixed tests:
backup
check
compress
grant
information_schema
multi_update
overflow
packet
query_cache_not_embedded
sp-threads
subselect
synchronization
timezone_grant
This commit is contained in:
@@ -1,7 +1,10 @@
|
||||
|
||||
# The server need to be started in $MYSQLTEST_VARDIR since it
|
||||
# uses ../std_data_ln/
|
||||
-- source include/uses_vardir.inc
|
||||
--source include/uses_vardir.inc
|
||||
|
||||
# Save the initial number of concurrent sessions
|
||||
--source include/count_sessions.inc
|
||||
|
||||
#
|
||||
# This test is a bit tricky as we can't use backup table to overwrite an old
|
||||
@@ -12,7 +15,7 @@ connect (con2,localhost,root,,);
|
||||
connection con1;
|
||||
set SQL_LOG_BIN=0;
|
||||
--disable_warnings
|
||||
drop table if exists t1, t2, t3;
|
||||
drop table if exists t1, t2, t3, t4;
|
||||
--enable_warnings
|
||||
create table t4(n int);
|
||||
--replace_result ": 1" ": X" ": 2" ": X" ": 22" ": X" ": 23" ": X" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||
@@ -57,6 +60,9 @@ unlock tables;
|
||||
connection con1;
|
||||
reap;
|
||||
drop table t5;
|
||||
connection default;
|
||||
disconnect con1;
|
||||
disconnect con2;
|
||||
remove_file $MYSQLTEST_VARDIR/tmp/t1.MYD;
|
||||
remove_file $MYSQLTEST_VARDIR/tmp/t2.MYD;
|
||||
remove_file $MYSQLTEST_VARDIR/tmp/t3.MYD;
|
||||
@@ -68,4 +74,9 @@ remove_file $MYSQLTEST_VARDIR/tmp/t3.frm;
|
||||
remove_file $MYSQLTEST_VARDIR/tmp/t4.frm;
|
||||
remove_file $MYSQLTEST_VARDIR/tmp/t5.frm;
|
||||
|
||||
|
||||
# End of 4.1 tests
|
||||
|
||||
# Wait till all disconnects are completed
|
||||
--source include/wait_until_count_sessions.inc
|
||||
|
||||
|
||||
Reference in New Issue
Block a user