diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-10 20:38:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-10 20:38:44 +0300 |
| commit | 7f84e3ad754df33746c57eec46c84138701c6444 (patch) | |
| tree | 844c30c03bbd46026a8de26a80bd5ff98f8f56a2 /mysql-test/suite/plugins | |
| parent | 545c5452063ec9fc8a2f770512002f6c67c96770 (diff) | |
| parent | 6d7a8269532f4989b1515f259120e91019a74dec (diff) | |
| download | mariadb-git-7f84e3ad754df33746c57eec46c84138701c6444.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/plugins')
| -rw-r--r-- | mysql-test/suite/plugins/t/feedback_plugin_load.test | 6 |
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 } |