diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-06-05 13:38:41 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-06-05 13:38:41 +0400 |
| commit | ccdfeb04d877bc79e37eb27bd0a8f4dd35cc25ea (patch) | |
| tree | 7502750f34f3f2147a252d705c170fa1a43b73c3 /plugin/query_response_time | |
| parent | afd134e21233d5333548662143204029f0a965e4 (diff) | |
| download | mariadb-git-ccdfeb04d877bc79e37eb27bd0a8f4dd35cc25ea.tar.gz | |
MDEV-4568 - Port Percona response time distribution as audit plugin
Test fixes.
Diffstat (limited to 'plugin/query_response_time')
4 files changed, 4 insertions, 17 deletions
diff --git a/plugin/query_response_time/mysql-test/query_response_time/basic.result b/plugin/query_response_time/mysql-test/query_response_time/basic.result index a89652dcbfd..b8aeb0a8e6e 100644 --- a/plugin/query_response_time/mysql-test/query_response_time/basic.result +++ b/plugin/query_response_time/mysql-test/query_response_time/basic.result @@ -10,30 +10,18 @@ QUERY_RESPONSE_TIME CREATE TEMPORARY TABLE `QUERY_RESPONSE_TIME` ( `COUNT` int(11) unsigned NOT NULL DEFAULT '0', `TOTAL` varchar(14) NOT NULL DEFAULT '' ) ENGINE=MEMORY DEFAULT CHARSET=utf8 -SELECT * FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'query_response_time%';; +SELECT PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE, PLUGIN_AUTHOR, PLUGIN_DESCRIPTION, PLUGIN_LICENSE, PLUGIN_MATURITY FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'query_response_time%';; PLUGIN_NAME QUERY_RESPONSE_TIME PLUGIN_VERSION 1.0 -PLUGIN_STATUS ACTIVE PLUGIN_TYPE INFORMATION SCHEMA -PLUGIN_TYPE_VERSION 100002.0 -PLUGIN_LIBRARY QUERY_RESPONSE_TIME_SO -PLUGIN_LIBRARY_VERSION 1.4 PLUGIN_AUTHOR Percona and Sergey Vojtovich PLUGIN_DESCRIPTION Query Response Time Distribution INFORMATION_SCHEMA Plugin PLUGIN_LICENSE GPL -LOAD_OPTION ON PLUGIN_MATURITY Alpha -PLUGIN_AUTH_VERSION 1.0 PLUGIN_NAME QUERY_RESPONSE_TIME_AUDIT PLUGIN_VERSION 1.0 -PLUGIN_STATUS ACTIVE PLUGIN_TYPE AUDIT -PLUGIN_TYPE_VERSION 3.0 -PLUGIN_LIBRARY QUERY_RESPONSE_TIME_SO -PLUGIN_LIBRARY_VERSION 1.4 PLUGIN_AUTHOR Percona and Sergey Vojtovich PLUGIN_DESCRIPTION Query Response Time Distribution Audit Plugin PLUGIN_LICENSE GPL -LOAD_OPTION ON PLUGIN_MATURITY Alpha -PLUGIN_AUTH_VERSION 1.0 diff --git a/plugin/query_response_time/mysql-test/query_response_time/basic.test b/plugin/query_response_time/mysql-test/query_response_time/basic.test index 3e9d64685dd..e46c8035d24 100644 --- a/plugin/query_response_time/mysql-test/query_response_time/basic.test +++ b/plugin/query_response_time/mysql-test/query_response_time/basic.test @@ -1,4 +1,3 @@ SHOW VARIABLES WHERE VARIABLE_NAME LIKE 'query_response_time%' AND VARIABLE_NAME!='query_response_time_exec_time_debug'; SHOW CREATE TABLE INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; ---replace_result $QUERY_RESPONSE_TIME_SO QUERY_RESPONSE_TIME_SO ---query_vertical SELECT * FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'query_response_time%'; +--query_vertical SELECT PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE, PLUGIN_AUTHOR, PLUGIN_DESCRIPTION, PLUGIN_LICENSE, PLUGIN_MATURITY FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'query_response_time%'; diff --git a/plugin/query_response_time/mysql-test/query_response_time/suite.opt b/plugin/query_response_time/mysql-test/query_response_time/suite.opt index 2530b70e7d5..dcf875578c1 100644 --- a/plugin/query_response_time/mysql-test/query_response_time/suite.opt +++ b/plugin/query_response_time/mysql-test/query_response_time/suite.opt @@ -1 +1 @@ ---plugin-load-add=$QUERY_RESPONSE_TIME_SO --plugin-query-response-time=ON --plugin-query-response-time-audit=ON +--plugin-load=$QUERY_RESPONSE_TIME_SO --plugin-query-response-time=ON --plugin-query-response-time-audit=ON diff --git a/plugin/query_response_time/mysql-test/query_response_time/suite.pm b/plugin/query_response_time/mysql-test/query_response_time/suite.pm index aabcc27ab65..4ee84a22f14 100644 --- a/plugin/query_response_time/mysql-test/query_response_time/suite.pm +++ b/plugin/query_response_time/mysql-test/query_response_time/suite.pm @@ -4,7 +4,7 @@ package My::Suite::Query_response_time; return "No QUERY_RESPONSE_TIME plugin" unless $ENV{QUERY_RESPONSE_TIME_SO} or - $::mysqld_variables{'query_response_time'} eq "ON"; + $::mysqld_variables{'query-response-time'} eq "ON"; return "Not run for embedded server" if $::opt_embedded_server; |