diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-22 17:14:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-22 17:14:05 +0100 |
| commit | 91b82a0f7343767950777ebc2b66f59372d3b3d5 (patch) | |
| tree | b255f725ad76f7bc5325c503b57c023b6e60a6b2 /storage/sequence | |
| parent | 902491c39764731e2d2ac09e399b9eb51ddd3e37 (diff) | |
| download | mariadb-git-91b82a0f7343767950777ebc2b66f59372d3b3d5.tar.gz | |
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
Diffstat (limited to 'storage/sequence')
| -rw-r--r-- | storage/sequence/mysql-test/sequence/simple.result | 5 | ||||
| -rw-r--r-- | storage/sequence/mysql-test/sequence/simple.test | 2 | ||||
| -rw-r--r-- | storage/sequence/mysql-test/sequence/suite.pm | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/storage/sequence/mysql-test/sequence/simple.result b/storage/sequence/mysql-test/sequence/simple.result index a1dbd33ec19..2802cdeb977 100644 --- a/storage/sequence/mysql-test/sequence/simple.result +++ b/storage/sequence/mysql-test/sequence/simple.result @@ -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; diff --git a/storage/sequence/mysql-test/sequence/simple.test b/storage/sequence/mysql-test/sequence/simple.test index 7c76997dddf..fd5b6c6d50c 100644 --- a/storage/sequence/mysql-test/sequence/simple.test +++ b/storage/sequence/mysql-test/sequence/simple.test @@ -1,5 +1,5 @@ --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' diff --git a/storage/sequence/mysql-test/sequence/suite.pm b/storage/sequence/mysql-test/sequence/suite.pm index 3dbf21c5d55..42333bb2870 100644 --- a/storage/sequence/mysql-test/sequence/suite.pm +++ b/storage/sequence/mysql-test/sequence/suite.pm @@ -1,4 +1,4 @@ -package My::Suite::Sequence +package My::Suite::Sequence; @ISA = qw(My::Suite); |