summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2019-10-10 10:25:32 +0300
committerMichael Widenius <monty@mariadb.org>2019-10-10 10:25:32 +0300
commit726b1998fc9a97a8b2e58fe56668d570c4a01891 (patch)
tree852cc3e92b6baa35f4746b252682d9dce2216c56
parent6fde0073bfa8f572a02637816a389e56e430edf9 (diff)
downloadmariadb-git-726b1998fc9a97a8b2e58fe56668d570c4a01891.tar.gz
Fixed feedback_plugin_load to work with staticly loaded plugin
-rw-r--r--mysql-test/suite/plugins/t/feedback_plugin_load.test6
1 files changed, 5 insertions, 1 deletions
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
}