diff options
| author | unknown <timour@askmonty.org> | 2013-07-03 22:34:12 +0300 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2013-07-03 22:34:12 +0300 |
| commit | 9c1285ba6cbd4a7f652b7cae85c698983106b5b1 (patch) | |
| tree | 29eb3d457f26010d34db43a09375ada6a03af98b /mysql-test/suite/perfschema | |
| parent | 9e5828f13f60c79ffe226ce4383012283e1c1704 (diff) | |
| download | mariadb-git-9c1285ba6cbd4a7f652b7cae85c698983106b5b1.tar.gz | |
MDEV-4058
MySQL 5.6.10 performance schema: merge of the test files for the host_cache table
With this patch, all tests perfschema.hostcache_* pass.
There are still some additional unmerged minor changes to these tests
in mysql 5.6.10.
Diffstat (limited to 'mysql-test/suite/perfschema')
3 files changed, 4 insertions, 5 deletions
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result index 158875d56de..1fa2f584fad 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result @@ -6,7 +6,7 @@ select @@global.debug; select @@global.max_connect_errors; @@global.max_connect_errors -10 +100 select @@global.max_connect_errors into @saved_max_connect_errors; set global max_connect_errors = 2; grant select on test.* to 'root'@'santa.claus.ipv4.example.com'; diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test index f2321b32551..f14edcffbb3 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test @@ -48,7 +48,7 @@ connect (con3,"127.0.0.1",plug,plug_dest,test,$MASTER_MYPORT,,,auth_test_plugin) --connection default --source ../include/hostcache_dump.inc -replace_result $AUTH_TEST_PLUGIN_SO PLUGIN_AUTH +--replace_result $AUTH_TEST_PLUGIN_SO PLUGIN_AUTH eval install plugin test_plugin_server soname '$AUTH_TEST_PLUGIN_SO'; --disable_query_log diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test index dc4bfe273d2..9c3b4cdaec3 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test @@ -49,9 +49,8 @@ connect (con3,"::1",plug,plug_dest,test,$MASTER_MYPORT,,,auth_test_plugin); --connection default --source ../include/hostcache_dump.inc -#--replace_result $PLUGIN_AUTH PLUGIN_AUTH -#eval install plugin test_plugin_server soname '$PLUGIN_AUTH'; -install plugin test_plugin_server soname 'auth_test_plugin'; +--replace_result $AUTH_TEST_PLUGIN_SO PLUGIN_AUTH +eval install plugin test_plugin_server soname '$AUTH_TEST_PLUGIN_SO'; --disable_query_log --error ER_ACCESS_DENIED_ERROR |