database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge 5.1-rpl repository -> 5.1-rpl local

Browse Source
This commit is contained in:
Andrei Elkin
2008-12-13 00:00:45 +02:00
parent fab8d1b460 aa78bb3030
commit d964d3f8db
18 changed files with 89 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/lib/mtr_report.pm
View File

@ -1,5 +1,5 @@
# -*- cperl -*-
# Copyright (C) 2004-2006 MySQL AB
# Copyright (C) 2004-2006 MySQL AB, 2008 Sun Microsystems, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -110,22 +110,26 @@ sub mtr_report_test ($) {
if ($result eq 'MTR_RES_FAILED'){
my $timest = format_time();
if ( $warnings )
{
mtr_report("[ fail ] Found warnings in server log file!");
mtr_report(" Test ended at $timest");
mtr_report($warnings);
return;
}
my $timeout= $tinfo->{'timeout'};
if ( $timeout )
{
mtr_report("[ fail ] timeout after $timeout minutes");
mtr_report("[ fail ] timeout after $timeout seconds");
mtr_report(" Test ended at $timest");
mtr_report("\n$tinfo->{'comment'}");
return;
}
else
{
mtr_report("[ fail ]");
mtr_report("[ fail ]\n Test ended at $timest");
}
if ( $logfile )
@ -372,6 +376,13 @@ use Time::localtime;
use Time::HiRes qw(gettimeofday);
sub format_time {
my $tm= localtime();
return sprintf("%4d-%02d-%02d %02d:%02d:%02d",
$tm->year + 1900, $tm->mon+1, $tm->mday,
$tm->hour, $tm->min, $tm->sec);
}
my $t0= gettimeofday();
sub _timestamp {