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

13625278 5.1=> 5.5

Browse Source
This commit is contained in:
sayantan.dutta@oracle.com
2013-02-05 13:42:56 +05:30
parent 37abedefde 1e25fc77d3
commit 9936f0ce6f
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/mysql-test-run.pl
View File

@@ -3994,6 +3994,7 @@ sub run_testcase ($) {
my $test= start_mysqltest($tinfo); my $test= start_mysqltest($tinfo);
# Set only when we have to keep waiting after expectedly died server # Set only when we have to keep waiting after expectedly died server
my $keep_waiting_proc = 0; my $keep_waiting_proc = 0;
my $print_timeout= start_timer($print_freq * 60);
while (1) while (1)
{ {
@@ -4017,9 +4018,24 @@ sub run_testcase ($) {
} }
} }
if (! $keep_waiting_proc) if (! $keep_waiting_proc)
{
if($test_timeout > $print_timeout)
{
$proc= My::SafeProcess->wait_any_timeout($print_timeout);
if ( $proc->{timeout} )
{
#print out that the test is still on
mtr_print("Test still running: $tinfo->{name}");
#reset the timer
$print_timeout= start_timer($print_freq * 60);
next;
}
}
else
{ {
$proc= My::SafeProcess->wait_any_timeout($test_timeout); $proc= My::SafeProcess->wait_any_timeout($test_timeout);
} }
}
# Will be restored if we need to keep waiting # Will be restored if we need to keep waiting
$keep_waiting_proc = 0; $keep_waiting_proc = 0;