1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-4058

Browse Source 
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.
This commit is contained in:
unknown 2013-07-03 22:34:12 +03:00
parent 9e5828f13f
commit 9c1285ba6c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
View File

@ -6,7 +6,7 @@ select @@global.debug;
select @@global.max_connect_errors; select @@global.max_connect_errors;
@@global.max_connect_errors @@global.max_connect_errors
10 100
select @@global.max_connect_errors into @saved_max_connect_errors; select @@global.max_connect_errors into @saved_max_connect_errors;
set global max_connect_errors = 2; set global max_connect_errors = 2;
grant select on test.* to 'root'@'santa.claus.ipv4.example.com'; grant select on test.* to 'root'@'santa.claus.ipv4.example.com';

2
mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test
View File

@ -48,7 +48,7 @@ connect (con3,"127.0.0.1",plug,plug_dest,test,$MASTER_MYPORT,,,auth_test_plugin)
--connection default --connection default
--source ../include/hostcache_dump.inc --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'; eval install plugin test_plugin_server soname '$AUTH_TEST_PLUGIN_SO';
--disable_query_log --disable_query_log

5
mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test
View File

@ -49,9 +49,8 @@ connect (con3,"::1",plug,plug_dest,test,$MASTER_MYPORT,,,auth_test_plugin);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
#--replace_result $PLUGIN_AUTH PLUGIN_AUTH --replace_result $AUTH_TEST_PLUGIN_SO PLUGIN_AUTH
#eval install plugin test_plugin_server soname '$PLUGIN_AUTH'; eval install plugin test_plugin_server soname '$AUTH_TEST_PLUGIN_SO';
install plugin test_plugin_server soname 'auth_test_plugin';
--disable_query_log --disable_query_log
--error ER_ACCESS_DENIED_ERROR --error ER_ACCESS_DENIED_ERROR