mirror of
https://github.com/MariaDB/server.git
synced 2025-03-07 11:43:08 +01:00
474fe6d9d9
and small collateral changes mysql-test/lib/My/Test.pm: somehow with "print" we get truncated writes sometimes mysql-test/suite/perfschema/r/digest_table_full.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/dml_handler.result: host table is not ported over yet mysql-test/suite/perfschema/r/information_schema.result: host table is not ported over yet mysql-test/suite/perfschema/r/nesting.result: this differs, because we don't rewrite general log queries, and multi-statement packets are logged as a one entry. this result file is identical to what mysql-5.6.5 produces with the --log-raw option. mysql-test/suite/perfschema/r/relaylog.result: MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB. mysql-test/suite/perfschema/r/server_init.result: MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup. mysql-test/suite/perfschema/r/stage_mdl_global.result: this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not do that, and this causes useless mutex locks and waits. mysql-test/suite/perfschema/r/statement_digest.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_consumers.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_long_query.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result: will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result: will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged
120 lines
2.9 KiB
Perl
120 lines
2.9 KiB
Perl
# -*- cperl -*-
|
|
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
|
|
#
|
|
# 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
|
|
# the Free Software Foundation; version 2 of the License.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
|
|
#
|
|
# One test
|
|
#
|
|
package My::Test;
|
|
|
|
use strict;
|
|
use warnings;
|
|
use Carp;
|
|
use Storable();
|
|
use mtr_results;
|
|
|
|
|
|
sub new {
|
|
my $class= shift;
|
|
my $self= bless {
|
|
@_,
|
|
}, $class;
|
|
return $self;
|
|
}
|
|
|
|
sub copy {
|
|
my $self= shift;
|
|
my $copy= My::Test->new();
|
|
while (my ($key, $value) = each(%$self)) {
|
|
if (ref $value eq "ARRAY") {
|
|
$copy->{$key} = [ @$value ];
|
|
} else {
|
|
$copy->{$key}= $value;
|
|
}
|
|
}
|
|
$copy;
|
|
}
|
|
|
|
sub fullname {
|
|
my ($self)= @_;
|
|
$self->{name} . (defined $self->{combinations}
|
|
? " '" . join(',', sort @{$self->{combinations}}) . "'"
|
|
: "")
|
|
}
|
|
|
|
#
|
|
# Return a unique key that can be used to
|
|
# identify this test in a hash
|
|
#
|
|
sub key {
|
|
my ($self)= @_;
|
|
return $self->{key};
|
|
}
|
|
|
|
|
|
sub is_failed {
|
|
my ($self)= @_;
|
|
my $result= $self->{result};
|
|
croak "'is_failed' can't be called until test has been run!"
|
|
unless defined $result;
|
|
|
|
return ($result eq 'MTR_RES_FAILED');
|
|
}
|
|
|
|
|
|
my %result_names= (
|
|
'MTR_RES_PASSED' => 'pass',
|
|
'MTR_RES_FAILED' => 'fail',
|
|
'MTR_RES_SKIPPED' => 'skipped',
|
|
);
|
|
|
|
sub write_test {
|
|
my ($test, $sock, $header)= @_;
|
|
|
|
if ($::opt_resfile && defined $test->{'result'}) {
|
|
resfile_test_info("result", $result_names{$test->{'result'}});
|
|
if ($test->{'timeout'}) {
|
|
resfile_test_info("comment", "Timeout");
|
|
} elsif (defined $test->{'comment'}) {
|
|
resfile_test_info("comment", $test->{'comment'});
|
|
}
|
|
resfile_test_info("result", "warning") if defined $test->{'check'};
|
|
resfile_to_test($test);
|
|
}
|
|
|
|
# Give the test a unique key before serializing it
|
|
$test->{key}= "$test" unless defined $test->{key};
|
|
|
|
my $serialized= Storable::freeze($test);
|
|
$serialized =~ s/([\x0d\x0a\\])/sprintf("\\%02x", ord($1))/eg;
|
|
send $sock,$header. "\n". $serialized. "\n", 0;
|
|
}
|
|
|
|
|
|
sub read_test {
|
|
my ($sock)= @_;
|
|
my $serialized= <$sock>;
|
|
chomp($serialized);
|
|
$serialized =~ s/\\([0-9a-fA-F]{2})/chr(hex($1))/eg;
|
|
my $test= Storable::thaw($serialized);
|
|
use Data::Dumper;
|
|
die "wrong class (hack attempt?): ".ref($test)."\n".Dumper(\$test, $serialized)
|
|
unless ref($test) eq 'My::Test';
|
|
resfile_from_test($test) if $::opt_resfile;
|
|
return $test;
|
|
}
|
|
|
|
1;
|