diff options
author | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
commit | 29acdcd5427e13bc3aefbbeee17b42bfe23dea84 (patch) | |
tree | f8f5365594c3b43e01891b7017f47fa6b934c646 /storage/xtradb | |
parent | e33bda183e80ff63a984ed2a938467950b23a3fd (diff) | |
parent | daec0004502a1f8c2ff7d46de92a61b5c4da1d6c (diff) | |
download | mariadb-git-29acdcd5427e13bc3aefbbeee17b42bfe23dea84.tar.gz |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804
Conflicts:
VERSION
debian/mariadb-backup-10.2.files
debian/mariadb-backup-10.2.install
debian/mariadb-backup-10.3.files
mysql-test/unstable-tests
Diffstat (limited to 'storage/xtradb')
-rw-r--r-- | storage/xtradb/mysql-test/storage_engine/parts/suite.pm | 8 | ||||
-rw-r--r-- | storage/xtradb/mysql-test/storage_engine/trx/suite.pm | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/storage/xtradb/mysql-test/storage_engine/parts/suite.pm b/storage/xtradb/mysql-test/storage_engine/parts/suite.pm new file mode 100644 index 00000000000..e186a532dcc --- /dev/null +++ b/storage/xtradb/mysql-test/storage_engine/parts/suite.pm @@ -0,0 +1,8 @@ +package My::Suite::SE::XtraDB; + +@ISA = qw(My::Suite); + +return "Need XtraDB engine"; + +bless { }; + diff --git a/storage/xtradb/mysql-test/storage_engine/trx/suite.pm b/storage/xtradb/mysql-test/storage_engine/trx/suite.pm new file mode 100644 index 00000000000..e186a532dcc --- /dev/null +++ b/storage/xtradb/mysql-test/storage_engine/trx/suite.pm @@ -0,0 +1,8 @@ +package My::Suite::SE::XtraDB; + +@ISA = qw(My::Suite); + +return "Need XtraDB engine"; + +bless { }; + |