Commit 91b82a0f authored by Sergei Golubchik's avatar Sergei Golubchik

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

Fix all suite.pm files that had errors and test files that were skipped because of that
parent 902491c3
......@@ -250,6 +250,7 @@ sub load_suite_object {
unless (defined $suites{$suitename}) {
if (-f "$suitedir/suite.pm") {
$suite= do "$suitedir/suite.pm";
mtr_error("Cannot load $suitedir/suite.pm: $@") if $@;
unless (ref $suite) {
my $comment = $suite;
$suite = My::Suite->new();
......
......@@ -2,8 +2,8 @@ package My::Suite::Archive;
@ISA = qw(My::Suite);
return ("Need Archive engine" unless $ENV{HA_ARCHIVE_SO} or
$::mysqld_variables{'archive'} eq "ON");
return "Need Archive engine" unless $ENV{HA_ARCHIVE_SO} or
$::mysqld_variables{'archive'} eq "ON";
bless { };
......@@ -262,10 +262,11 @@ commit;
select count(*) from t1;
count(*)
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
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 */
drop table t1;
drop table seq_1_to_1;
......
--source inc.inc
--source include/have_xtradb.inc
--source include/have_innodb.inc
--source include/have_binlog_format_statement.inc
--query_vertical select * from information_schema.engines where engine='sequence'
......
package My::Suite::Sequence
package My::Suite::Sequence;
@ISA = qw(My::Suite);
......
package My::Suite::SQL_Discovery
package My::Suite::SQL_Discovery;
@ISA = qw(My::Suite);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment