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

upmerge 56654

Browse Source
This commit is contained in:
Bjorn Munch
2010-10-19 14:13:05 +02:00
parent bd2aeaacae 5c42b3c9ed
commit 3b15deb152
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,13 +618,15 @@ sub run_test_server ($$$) {
if ($test_has_failed and $retries <= $opt_retry){ if ($test_has_failed and $retries <= $opt_retry){
# Test should be run one more time unless it has failed # Test should be run one more time unless it has failed
# too many times already # too many times already
my $tname= $result->{name};
my $failures= $result->{failures}; my $failures= $result->{failures};
if ($opt_retry > 1 and $failures >= $opt_retry_failure){ if ($opt_retry > 1 and $failures >= $opt_retry_failure){
mtr_report("\nTest has failed $failures times,", mtr_report("\nTest $tname has failed $failures times,",
"no more retries!\n"); "no more retries!\n");
} }
else { else {
mtr_report("\nRetrying test, attempt($retries/$opt_retry)...\n"); mtr_report("\nRetrying test $tname, ".
"attempt($retries/$opt_retry)...\n");
delete($result->{result}); delete($result->{result});
$result->{retries}= $retries+1; $result->{retries}= $retries+1;
$result->write_test($sock, 'TESTCASE'); $result->write_test($sock, 'TESTCASE');
@ -3204,7 +3206,8 @@ sub check_testcase($$)
"\nMTR's internal check of the test case '$tname' failed. "\nMTR's internal check of the test case '$tname' failed.
This means that the test case does not preserve the state that existed This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not before the test case was executed. Most likely the test case did not
do a proper clean-up. do a proper clean-up. It could also be caused by the previous test run
by this thread, if the server wasn't restarted.
This is the diff of the states of the servers before and after the This is the diff of the states of the servers before and after the
test case was executed:\n"; test case was executed:\n";
$tinfo->{check}.= $report; $tinfo->{check}.= $report;
@ -3246,7 +3249,11 @@ test case was executed:\n";
# Kill any check processes still running # Kill any check processes still running
map($_->kill(), values(%started)); map($_->kill(), values(%started));
mtr_warning("Check-testcase failed, this could also be caused by the" .
" previous test run by this worker thread")
if $result > 1 && $mode eq "before";
mark_time_used('check'); mark_time_used('check');
return $result; return $result;
} }
@ -3884,7 +3891,9 @@ sub get_log_from_proc ($$) {
foreach my $mysqld (mysqlds()) { foreach my $mysqld (mysqlds()) {
if ($mysqld->{proc} eq $proc) { if ($mysqld->{proc} eq $proc) {
my @srv_lines= extract_server_log($mysqld->value('#log-error'), $name); my @srv_lines= extract_server_log($mysqld->value('#log-error'), $name);
$srv_log= "\nServer log from this test:\n" . join ("", @srv_lines); $srv_log= "\nServer log from this test:\n" .
"----------SERVER LOG START-----------\n". join ("", @srv_lines) .
"----------SERVER LOG END-------------\n";
last; last;
} }
} }

2
mysql-test/t/mysqltest.test
View File

@ -331,7 +331,7 @@ eval select $mysql_errno as "after_!errno_masked_error" ;
--exec illegal_command --exec illegal_command
--cat_file does_not_exist --cat_file does_not_exist
--perl --perl
exit(1); exit(2);
EOF EOF
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------

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

@ -53,7 +53,7 @@ while (!`select @aborted_clients`)
dec $retries; dec $retries;
if (!$retries) if (!$retries)
{ {
Failed to detect that client has been aborted; die Failed to detect that client has been aborted;
} }
} }
--enable_query_log --enable_query_log
@ -108,7 +108,7 @@ while (!`select @aborted_clients`)
dec $retries; dec $retries;
if (!$retries) if (!$retries)
{ {
Failed to detect that client has been aborted; die Failed to detect that client has been aborted;
} }
} }
--enable_query_log --enable_query_log