database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

BUG#19951: Race conditions in test wait_timeout.

Browse Source 
Fix random failures in test 'wait_timeout' that depend on exact timing.

1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.

2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.


mysql-test/r/wait_timeout.result:
  Fix two races in test.
mysql-test/t/wait_timeout.test:
  Fix two races in test.
This commit is contained in:
unknown
2006-07-06 23:49:09 +02:00
parent 0f93a64eff
commit 224082fc6b
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/wait_timeout.result
View File

@ -1,3 +1,7 @@
select 0;
0
0
flush status;
select 1; select 1;
1 1
1 1

12
mysql-test/t/wait_timeout.test
View File

@ -9,16 +9,20 @@
# Connect with another connection and reset counters # Connect with another connection and reset counters
--disable_query_log --disable_query_log
connect (wait_con,localhost,root,,test,,); connect (wait_con,localhost,root,,test,,);
flush status; # Reset counters
connection wait_con; connection wait_con;
set session wait_timeout=100; set session wait_timeout=100;
let $retries=300; let $retries=300;
let $aborted_clients = `SHOW STATUS LIKE 'aborted_clients'`;
set @aborted_clients= 0; set @aborted_clients= 0;
--enable_query_log --enable_query_log
# Disable reconnect and do the query # Disable reconnect and do the query
connection default; connection default;
# If slow host (Valgrind...), we may have already timed out here.
# So force a reconnect if necessary, using a dummy query. And issue a
# 'flush status' to reset the 'aborted_clients' counter.
--enable_reconnect
select 0;
flush status;
--disable_reconnect --disable_reconnect
select 1; select 1;
@ -46,6 +50,9 @@ connection default;
select 2; select 2;
--enable_reconnect --enable_reconnect
select 3; select 3;
# Disconnect so that we will not be confused by a future abort from this
# connection.
disconnect default
# #
# Do the same test as above on a TCP connection # Do the same test as above on a TCP connection
@ -56,7 +63,6 @@ select 3;
connection wait_con; connection wait_con;
flush status; # Reset counters flush status; # Reset counters
let $retries=300; let $retries=300;
let $aborted_clients = `SHOW STATUS LIKE 'aborted_clients'`;
set @aborted_clients= 0; set @aborted_clients= 0;
--enable_query_log --enable_query_log