diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-28 10:56:38 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-28 10:56:38 +0100 |
| commit | 65e26bc1ba7b81d8477d51534d30f072f38913a1 (patch) | |
| tree | c8838a53d1214959c70b6c011729852c05582550 /mysql-test/include | |
| parent | cc5f4428b8b568f98e967a57178efcaf78702168 (diff) | |
| parent | d03ea82759aef7734f162c3137b10aa2476b35e9 (diff) | |
| download | mariadb-git-65e26bc1ba7b81d8477d51534d30f072f38913a1.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_not_innodb_plugin.inc | 4 | ||||
| -rw-r--r-- | mysql-test/include/have_static_innodb.inc | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/mysql-test/include/have_not_innodb_plugin.inc b/mysql-test/include/have_not_innodb_plugin.inc deleted file mode 100644 index e40fd811021..00000000000 --- a/mysql-test/include/have_not_innodb_plugin.inc +++ /dev/null @@ -1,4 +0,0 @@ -disable_query_log; ---require r/not_true.require -select (PLUGIN_LIBRARY LIKE 'ha_innodb_plugin%' OR PLUGIN_DESCRIPTION LIKE '%xtradb%') as `TRUE` from information_schema.plugins where PLUGIN_NAME='InnoDB'; -enable_query_log; diff --git a/mysql-test/include/have_static_innodb.inc b/mysql-test/include/have_static_innodb.inc new file mode 100644 index 00000000000..0d7bb856f4f --- /dev/null +++ b/mysql-test/include/have_static_innodb.inc @@ -0,0 +1,7 @@ +source include/have_innodb.inc; + +if (!`select count(*) from information_schema.plugins + where plugin_name = 'innodb' and plugin_status = 'active' and + plugin_library is null`) { + skip Need compiled-in InnoDB; +} |