cleanup: have_static_innodb.inc

and remove unused files
MariaDB · Oct 27, 2020 · a7d5e85 · a7d5e85
1 parent 1269fd4
commit a7d5e85
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/mysql-test/include/have_not_innodb_plugin.inc b/mysql-test/include/have_not_innodb_plugin.inc
diff --git a/mysql-test/include/have_static_innodb.inc 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;
+}
diff --git a/mysql-test/r/not_true.require b/mysql-test/r/not_true.require
diff --git a/mysql-test/t/plugin_innodb.test b/mysql-test/t/plugin_innodb.test
@@ -1,13 +1,6 @@
 --source include/not_embedded.inc
 --source include/have_example_plugin.inc
---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;
-}
-
+--source include/have_static_innodb.inc
 
 --replace_regex /\.dll/.so/
 eval install plugin example soname '$HA_EXAMPLE_SO';