Fixed feedback_plugin_load to work with staticly loaded plugin

montywi · montywi · commit 726b1998fc9a · 2019-10-10T10:25:32.000+03:00
diff --git 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
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`		-if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'feedback' and plugin_status='active' and @@feedback_url <> ""`)
	`1`	+if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'feedback' and plugin_status='active'`)
	`2`	`+{`
	`3`	`+ --skip Feedback plugin is not active`
	`4`	`+}`
	`5`	+if (`select @@feedback_url = ""`)
`2`	`6`	`{`
`3`	`7`	`--skip Feedback plugin is not active`
`4`	`8`	`}`