diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-08-25 22:22:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-08-25 22:22:33 +0200 |
| commit | 9bc9855c16f815e71223398ef17cd6052becc44e (patch) | |
| tree | 89f63ff036ddfcf76bcdc342ec71e0129ba42c89 /mysql-test/include | |
| parent | 1aa3b02c51f00c142fb89c809e6228d6f99288d9 (diff) | |
| download | mariadb-git-9bc9855c16f815e71223398ef17cd6052becc44e.tar.gz | |
mtr changes:
* expanding unknown env variable does not abort mtr
* have_archive, blackhole, innodb - preload the corresponding engine
* all options from .opt files get equal treatment, all are searched for special options,
not only -{master,slave}.opt as before (which ignored suite.opt and --mysqld=...)
* --plugin-load gets special treatment too - all instances are merged into one
* federated test fixed to preload federated
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_archive.inc | 9 | ||||
| -rw-r--r-- | mysql-test/include/have_archive.opt | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_blackhole.opt | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_innodb.opt | 1 | ||||
| -rw-r--r-- | mysql-test/include/have_pbxt.inc | 9 |
5 files changed, 15 insertions, 8 deletions
diff --git a/mysql-test/include/have_archive.inc b/mysql-test/include/have_archive.inc index 82399ca4c6c..0fd85fa576f 100644 --- a/mysql-test/include/have_archive.inc +++ b/mysql-test/include/have_archive.inc @@ -1,4 +1,5 @@ ---disable_query_log ---require r/true.require -select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'archive'; ---enable_query_log +if (!`SELECT count(*) FROM information_schema.engines WHERE + (support = 'YES' OR support = 'DEFAULT') AND + engine = 'archive'`){ + skip Need archive engine; +} diff --git a/mysql-test/include/have_archive.opt b/mysql-test/include/have_archive.opt new file mode 100644 index 00000000000..cf9309d9fb0 --- /dev/null +++ b/mysql-test/include/have_archive.opt @@ -0,0 +1,2 @@ +--loose-archive +--plugin-load=$HA_ARCHIVE_SO diff --git a/mysql-test/include/have_blackhole.opt b/mysql-test/include/have_blackhole.opt new file mode 100644 index 00000000000..b600b468390 --- /dev/null +++ b/mysql-test/include/have_blackhole.opt @@ -0,0 +1,2 @@ +--loose-blackhole +--plugin-load=$HA_BLACKHOLE_SO diff --git a/mysql-test/include/have_innodb.opt b/mysql-test/include/have_innodb.opt index 48457b17309..4fb96229a7b 100644 --- a/mysql-test/include/have_innodb.opt +++ b/mysql-test/include/have_innodb.opt @@ -1 +1,2 @@ --loose-innodb +--plugin-load=$HA_XTRADB_SO diff --git a/mysql-test/include/have_pbxt.inc b/mysql-test/include/have_pbxt.inc index a8afc2c8324..b11aee2617f 100644 --- a/mysql-test/include/have_pbxt.inc +++ b/mysql-test/include/have_pbxt.inc @@ -1,4 +1,5 @@ -disable_query_log; ---require r/true.require -select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'pbxt'; -enable_query_log; +if (!`SELECT count(*) FROM information_schema.engines WHERE + (support = 'YES' OR support = 'DEFAULT') AND + engine = 'pbxt'`){ + skip Need PBXT engine; +} |