mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl-win

Browse source 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
This commit is contained in:
msvensson@pilot.mysql.com 2008-04-24 14:43:51 +02:00
commit 6ccf956a74
3 changed files with 61 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/lib/mtr_cases.pm
View file

@ -46,7 +46,7 @@ sub collect_option {
my ($opt, $value)= @_;
# Convert - to _ in option name
$opt =~ s/-/_/;
$opt =~ s/-/_/g;
no strict 'refs';
${$opt}= $value;
}

34
mysql-test/lib/mtr_report.pm
View file

@ -26,8 +26,7 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line
mtr_print_header mtr_report mtr_report_stats
mtr_warning mtr_error mtr_debug mtr_verbose
mtr_verbose_restart mtr_report_test_passed
mtr_report_test_failed mtr_report_test_skipped
mtr_report_stats);
mtr_report_test_failed mtr_report_test_skipped);
use mtr_match;
require "mtr_io.pl";
@ -35,12 +34,13 @@ require "mtr_io.pl";
my $tot_real_time= 0;
our $timestamp= 0;
our $timediff= 1;
sub report_option {
my ($opt, $value)= @_;
# Convert - to _ in option name
$opt =~ s/-/_/;
$opt =~ s/-/_/g;
no strict 'refs';
${$opt}= $value;
}
@ -228,20 +228,20 @@ sub mtr_report_stats ($) {
# Print a list of check_testcases that failed(if any)
if ( $::opt_check_testcases )
{
my @check_testcases= ();
my %check_testcases;
foreach my $tinfo (@$tests)
{
if ( defined $tinfo->{'check_testcase_failed'} )
{
push(@check_testcases, $tinfo->{'name'});
$check_testcases{$tinfo->{'name'}}= 1;
}
}
if ( @check_testcases )
if ( keys %check_testcases )
{
print "Check of testcase failed for: ";
print join(" ", @check_testcases);
print join(" ", keys %check_testcases);
print "\n\n";
}
}
@ -330,13 +330,29 @@ sub mtr_print_header () {
use Time::localtime;
use Time::HiRes qw(gettimeofday);
my $t0= gettimeofday();
sub _timestamp {
return "" unless $timestamp;
my $diff;
if ($timediff){
my $t1= gettimeofday();
my $elapsed= $t1 - $t0;
$diff= sprintf(" +%02.3f", $elapsed);
# Save current time for next lap
$t0= $t1;
}
my $tm= localtime();
return sprintf("%02d%02d%02d %2d:%02d:%02d ",
return sprintf("%02d%02d%02d %2d:%02d:%02d%s ",
$tm->year % 100, $tm->mon+1, $tm->mday,
$tm->hour, $tm->min, $tm->sec);
$tm->hour, $tm->min, $tm->sec, $diff);
}

51
mysql-test/mysql-test-run.pl
View file

@ -2020,6 +2020,9 @@ sub sql_to_bootstrap {
next;
}
# Replace @HOSTNAME with localhost
$line=~ s/\'\@HOSTNAME\@\'/localhost/;
# Default, just add the line without newline
# but with a space as separator
$result.= "$line ";
@ -2071,24 +2074,40 @@ sub mysql_install_db {
# ----------------------------------------------------------------------
my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql";
# Use the mysql database for system tables
mtr_tofile($bootstrap_sql_file, "use mysql\n");
if (-f "$path_sql_dir/mysql_system_tables.sql")
{
# Use the mysql database for system tables
mtr_tofile($bootstrap_sql_file, "use mysql\n");
# Add the offical mysql system tables
# for a production system
mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables.sql",
$bootstrap_sql_file);
# Add the offical mysql system tables
# for a production system
mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables.sql",
$bootstrap_sql_file);
# Add the mysql system tables initial data
# for a production system
mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables_data.sql",
$bootstrap_sql_file);
# Add the mysql system tables initial data
# for a production system
mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables_data.sql",
$bootstrap_sql_file);
# Add test data for timezone - this is just a subset, on a real
# system these tables will be populated either by mysql_tzinfo_to_sql
# or by downloading the timezone table package from our website
mtr_appendfile_to_file("$path_sql_dir/mysql_test_data_timezone.sql",
$bootstrap_sql_file);
# Add test data for timezone - this is just a subset, on a real
# system these tables will be populated either by mysql_tzinfo_to_sql
# or by downloading the timezone table package from our website
mtr_appendfile_to_file("$path_sql_dir/mysql_test_data_timezone.sql",
$bootstrap_sql_file);
}
else
{
# Install db from init_db.sql that exist in early 5.1 and 5.0
# versions of MySQL
my $init_file= "$basedir/mysql-test/lib/init_db.sql";
mtr_report(" - from '$init_file'");
my $text= mtr_grab_file($init_file) or
mtr_error("Can't open '$init_file': $!");
mtr_tofile($bootstrap_sql_file,
sql_to_bootstrap($text));
}
# Fill help tables, just an empty file when running from bk repo
# but will be replaced by a real fill_help_tables.sql when
@ -3741,7 +3760,7 @@ Options to control what engine/variation to run
config|defaults-file=<config template> Use fixed config template for all
tests
extra_defaults_file=<config template> Extra config template to add to
defaults_extra_file=<config template> Extra config template to add to
all generated configs
Options to control directories to use