From 726b1998fc9a97a8b2e58fe56668d570c4a01891 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@mariadb.org>
Date: Thu, 10 Oct 2019 10:25:32 +0300
Subject: Fixed feedback_plugin_load to work with staticly loaded plugin
---
mysql-test/suite/plugins/t/feedback_plugin_load.test | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'mysql-test/suite/plugins')
diff --git a/mysql-test/suite/plugins/t/feedback_plugin_load.test b/mysql-test/suite/plugins/t/feedback_plugin_load.test
index 1f9f837308b..c0546cef0f9 100644
--- a/mysql-test/suite/plugins/t/feedback_plugin_load.test
+++ b/mysql-test/suite/plugins/t/feedback_plugin_load.test
@@ -1,4 +1,8 @@
-if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'feedback' and plugin_status='active' and @@feedback_url <> ""`)
+if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'feedback' and plugin_status='active'`)
+{
+ --skip Feedback plugin is not active
+}
+if (`select @@feedback_url = ""`)
{
--skip Feedback plugin is not active
}
--
cgit v1.2.1