From a7d5e85c4935080458fea21c718f56c7bf6f02bd Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Mon, 26 Oct 2020 17:20:59 +0100
Subject: [PATCH] cleanup: have_static_innodb.inc

and remove unused files
---
 mysql-test/include/have_not_innodb_plugin.inc | 4 ----
 mysql-test/include/have_static_innodb.inc     | 7 +++++++
 mysql-test/r/not_true.require                 | 2 --
 mysql-test/t/plugin_innodb.test               | 9 +--------
 4 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 mysql-test/include/have_not_innodb_plugin.inc
 create mode 100644 mysql-test/include/have_static_innodb.inc
 delete mode 100644 mysql-test/r/not_true.require

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;
+}
diff --git a/mysql-test/r/not_true.require b/mysql-test/r/not_true.require
deleted file mode 100644
index 0032832f3d1..00000000000
--- a/mysql-test/r/not_true.require
+++ /dev/null
@@ -1,2 +0,0 @@
-TRUE
-NULL
diff --git a/mysql-test/t/plugin_innodb.test b/mysql-test/t/plugin_innodb.test
index fb5dd84b997..03afa190400 100644
--- 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';