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

mtr: abort when a suite.pm fails to load, don't just ignore the errors.

Browse Source 
Fix all suite.pm files that had errors and test files that were skipped because of that
This commit is contained in:
Sergei Golubchik
2013-12-22 17:14:05 +01:00
parent 902491c397
commit 91b82a0f73
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/lib/mtr_cases.pm
View File

@ -250,6 +250,7 @@ sub load_suite_object {
unless (defined $suites{$suitename}) { unless (defined $suites{$suitename}) {
if (-f "$suitedir/suite.pm") { if (-f "$suitedir/suite.pm") {
$suite= do "$suitedir/suite.pm"; $suite= do "$suitedir/suite.pm";
mtr_error("Cannot load $suitedir/suite.pm: $@") if $@;
unless (ref $suite) { unless (ref $suite) {
my $comment = $suite; my $comment = $suite;
$suite = My::Suite->new(); $suite = My::Suite->new();

4
mysql-test/suite/archive/suite.pm
View File

@ -2,8 +2,8 @@ package My::Suite::Archive;
@ISA = qw(My::Suite); @ISA = qw(My::Suite);
return ("Need Archive engine" unless $ENV{HA_ARCHIVE_SO} or return "Need Archive engine" unless $ENV{HA_ARCHIVE_SO} or
$::mysqld_variables{'archive'} eq "ON"); $::mysqld_variables{'archive'} eq "ON";
bless { }; bless { };

5
storage/sequence/mysql-test/sequence/simple.result
View File

@ -262,10 +262,11 @@ commit;
select count(*) from t1; select count(*) from t1;
count(*) count(*)
10 10
show binlog events from <binlog_start> limit 10; include/show_binlog_events.inc
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # BEGIN GTID #-#-# master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use test; insert t1 select * from seq_1_to_10 master-bin.000001 # Query # # use `test`; insert t1 select * from seq_1_to_10
master-bin.000001 # Query # # SAVEPOINT s1
master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Xid # # COMMIT /* XID */
drop table t1; drop table t1;
drop table seq_1_to_1; drop table seq_1_to_1;

2
storage/sequence/mysql-test/sequence/simple.test
View File

@ -1,5 +1,5 @@
--source inc.inc --source inc.inc
--source include/have_xtradb.inc --source include/have_innodb.inc
--source include/have_binlog_format_statement.inc --source include/have_binlog_format_statement.inc
--query_vertical select * from information_schema.engines where engine='sequence' --query_vertical select * from information_schema.engines where engine='sequence'

2
storage/sequence/mysql-test/sequence/suite.pm
View File

@ -1,4 +1,4 @@
package My::Suite::Sequence package My::Suite::Sequence;
@ISA = qw(My::Suite); @ISA = qw(My::Suite);

2
storage/test_sql_discovery/mysql-test/sql_discovery/suite.pm
View File

@ -1,4 +1,4 @@
package My::Suite::SQL_Discovery package My::Suite::SQL_Discovery;
@ISA = qw(My::Suite); @ISA = qw(My::Suite);