diff options
| -rw-r--r-- | mysql-test/r/feedback_plugin_install.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/feedback_plugin_load.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/feedback_plugin_send.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/feedback_plugin_install.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/feedback_plugin_load.test | 1 |
5 files changed, 8 insertions, 6 deletions
diff --git a/mysql-test/r/feedback_plugin_install.result b/mysql-test/r/feedback_plugin_install.result index e017276b619..4b3b0226fae 100644 --- a/mysql-test/r/feedback_plugin_install.result +++ b/mysql-test/r/feedback_plugin_install.result @@ -5,9 +5,9 @@ ACTIVE select * from information_schema.feedback where variable_name like 'feed%' and variable_name not like '%_uid'; VARIABLE_NAME VARIABLE_VALUE +FEEDBACK 1.0 FEEDBACK_SEND_RETRY_WAIT 60 -FEEDBACK_USER_INFO mysql-test FEEDBACK_SEND_TIMEOUT 60 FEEDBACK_URL http://mariadb.org/feedback_plugin/post -FEEDBACK 1.0 +FEEDBACK_USER_INFO mysql-test uninstall plugin feedback; diff --git a/mysql-test/r/feedback_plugin_load.result b/mysql-test/r/feedback_plugin_load.result index f097c5d9a9d..bc02b920a11 100644 --- a/mysql-test/r/feedback_plugin_load.result +++ b/mysql-test/r/feedback_plugin_load.result @@ -4,8 +4,8 @@ ACTIVE select * from information_schema.feedback where variable_name like 'feed%' and variable_name not like '%_uid'; VARIABLE_NAME VARIABLE_VALUE +FEEDBACK 1.0 FEEDBACK_SEND_RETRY_WAIT 60 -FEEDBACK_USER_INFO mysql-test FEEDBACK_SEND_TIMEOUT 60 FEEDBACK_URL http://mariadb.org/feedback_plugin/post -FEEDBACK 1.0 +FEEDBACK_USER_INFO mysql-test diff --git a/mysql-test/r/feedback_plugin_send.result b/mysql-test/r/feedback_plugin_send.result index e7d3238146b..22379e26248 100644 --- a/mysql-test/r/feedback_plugin_send.result +++ b/mysql-test/r/feedback_plugin_send.result @@ -4,11 +4,11 @@ ACTIVE select * from information_schema.feedback where variable_name like 'feed%' and variable_name not like '%_uid'; VARIABLE_NAME VARIABLE_VALUE +FEEDBACK 1.0 FEEDBACK_SEND_RETRY_WAIT 60 -FEEDBACK_USER_INFO mysql-test FEEDBACK_SEND_TIMEOUT 60 FEEDBACK_URL http://mariadb.org/feedback_plugin/post -FEEDBACK 1.0 +FEEDBACK_USER_INFO mysql-test feedback plugin: report to 'http://mariadb.org/feedback_plugin/post' was sent feedback plugin: server replied 'ok' feedback plugin: report to 'http://mariadb.org/feedback_plugin/post' was sent diff --git a/mysql-test/t/feedback_plugin_install.test b/mysql-test/t/feedback_plugin_install.test index f2bbe0b9e58..81343c436c3 100644 --- a/mysql-test/t/feedback_plugin_install.test +++ b/mysql-test/t/feedback_plugin_install.test @@ -8,6 +8,7 @@ if (`select length('$FEEDBACK_SO') = 0`) { eval install plugin feedback soname '$FEEDBACK_SO'; select plugin_status from information_schema.plugins where plugin_name='feedback'; --replace_result https http +--sorted_result select * from information_schema.feedback where variable_name like 'feed%' and variable_name not like '%_uid'; uninstall plugin feedback; diff --git a/mysql-test/t/feedback_plugin_load.test b/mysql-test/t/feedback_plugin_load.test index a395052dafe..5ad301667b4 100644 --- a/mysql-test/t/feedback_plugin_load.test +++ b/mysql-test/t/feedback_plugin_load.test @@ -5,5 +5,6 @@ if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'fe select plugin_status from information_schema.plugins where plugin_name='feedback'; --replace_result https http +--sorted_result select * from information_schema.feedback where variable_name like 'feed%' and variable_name not like '%_uid'; |