diff options
| author | Alexander Barkov <bar@mariadb.org> | 2014-08-11 05:45:45 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2014-08-11 05:45:45 +0400 |
| commit | 22a64047d14d1199ced885f63bcccd39459681d6 (patch) | |
| tree | 8087b8b89fe8602f43355f88ce91c8ce1e34b55b /mysql-test/suite/plugins | |
| parent | 4105cbf4a230c82ea7dee31d4d2262b798fad9f4 (diff) | |
| download | mariadb-git-22a64047d14d1199ced885f63bcccd39459681d6.tar.gz | |
MDEV-6274 Collation usage statistics
Adding collation usage statistics into the feedback plugin I_S table.
Diffstat (limited to 'mysql-test/suite/plugins')
| -rw-r--r-- | mysql-test/suite/plugins/r/feedback_plugin_load.result | 9 | ||||
| -rw-r--r-- | mysql-test/suite/plugins/t/feedback_plugin_load.test | 13 |
2 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/suite/plugins/r/feedback_plugin_load.result b/mysql-test/suite/plugins/r/feedback_plugin_load.result index 443b91bf0cc..e5d1296ae53 100644 --- a/mysql-test/suite/plugins/r/feedback_plugin_load.result +++ b/mysql-test/suite/plugins/r/feedback_plugin_load.result @@ -10,3 +10,12 @@ FEEDBACK_SEND_RETRY_WAIT 60 FEEDBACK_SEND_TIMEOUT 60 FEEDBACK_URL http://mariadb.org/feedback_plugin/post FEEDBACK_USER_INFO mysql-test +SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK +WHERE VARIABLE_NAME LIKE 'Collation used %' +ORDER BY VARIABLE_NAME; +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 diff --git a/mysql-test/suite/plugins/t/feedback_plugin_load.test b/mysql-test/suite/plugins/t/feedback_plugin_load.test index 5ad301667b4..b1bcb2a6bbd 100644 --- a/mysql-test/suite/plugins/t/feedback_plugin_load.test +++ b/mysql-test/suite/plugins/t/feedback_plugin_load.test @@ -8,3 +8,16 @@ select plugin_status from information_schema.plugins where plugin_name='feedback --sorted_result select * from information_schema.feedback where variable_name like 'feed%' and variable_name not like '%_uid'; + + +# Embedded server does not use the table mysqld.user and thus +# does not automatically use latin1_bin on startup. Use it manually. +--disable_query_log +if (`SELECT VERSION() LIKE '%embedded%'`) +{ + DO _latin1'test' COLLATE latin1_bin; +} +--enable_query_log +SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK +WHERE VARIABLE_NAME LIKE 'Collation used %' +ORDER BY VARIABLE_NAME; |