diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-11 10:15:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-11 10:15:52 +0300 |
| commit | 1d71dacd519a8ea51e7c8a9207e0b146d794c8eb (patch) | |
| tree | 60bccbe261046a943c378a9871d80e8f42061012 | |
| parent | 26eb6664636dd969e2e9c14cf0ac5d038a0c403c (diff) | |
| download | mariadb-git-1d71dacd519a8ea51e7c8a9207e0b146d794c8eb.tar.gz | |
MDEV-24454 fixup: Fix plugins.feedback_plugin_send
In commit 3690c549c6e72646ba74f6b4c83813ee4ac3aea4
this test was not adjusted.
| -rw-r--r-- | mysql-test/suite/plugins/r/feedback_plugin_send.result | 20 | ||||
| -rw-r--r-- | mysql-test/suite/plugins/t/feedback_plugin_send.test | 2 |
2 files changed, 19 insertions, 3 deletions
diff --git a/mysql-test/suite/plugins/r/feedback_plugin_send.result b/mysql-test/suite/plugins/r/feedback_plugin_send.result index 70dfbcb62dc..fec42f577ad 100644 --- a/mysql-test/suite/plugins/r/feedback_plugin_send.result +++ b/mysql-test/suite/plugins/r/feedback_plugin_send.result @@ -24,6 +24,22 @@ VARIABLE_VALUE>0 VARIABLE_NAME 1 Collation used latin1_swedish_ci 1 Collation used utf8_bin 1 Collation used utf8_general_ci +prepare stmt from "SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK WHERE VARIABLE_NAME LIKE 'Collation used %' ORDER BY VARIABLE_NAME"; +execute stmt; +VARIABLE_VALUE>0 VARIABLE_NAME +1 Collation used binary +1 Collation used latin1_bin +1 Collation used latin1_swedish_ci +1 Collation used utf8_bin +1 Collation used utf8_general_ci +execute stmt; +VARIABLE_VALUE>0 VARIABLE_NAME +1 Collation used binary +1 Collation used latin1_bin +1 Collation used latin1_swedish_ci +1 Collation used utf8_bin +1 Collation used utf8_general_ci +deallocate prepare stmt; set global sql_mode=ONLY_FULL_GROUP_BY; -6: feedback plugin: report to 'http://mariadb.org/feedback_plugin/post' was sent -6: feedback plugin: server replied 'ok' +feedback plugin: report to 'http://mariadb.org/feedback_plugin/post' was sent +feedback plugin: server replied 'ok' diff --git a/mysql-test/suite/plugins/t/feedback_plugin_send.test b/mysql-test/suite/plugins/t/feedback_plugin_send.test index b28f9d4cb38..0ea1814ec29 100644 --- a/mysql-test/suite/plugins/t/feedback_plugin_send.test +++ b/mysql-test/suite/plugins/t/feedback_plugin_send.test @@ -38,6 +38,6 @@ perl; while ($_=<LOG>) { $logg{$&}++ if /feedback plugin:.*/; } - print "$logg{$_}: $_\n" for sort keys %logg; + print "$_\n" for sort keys %logg; close LOG; EOF |