From 00f4f408ea52d63841f3bed9c66be252092f0ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Thu, 17 Oct 2013 20:51:19 -0700 Subject: [PATCH] Minor update on tests. Fixed possible failing condition due to different order of table rows --- mysql-test/r/acl_roles_set_role-recursive.result | 8 ++++++-- mysql-test/r/acl_roles_set_role-simple.result | 4 ++-- mysql-test/t/acl_roles_set_role-recursive.test | 6 ++++-- mysql-test/t/acl_roles_set_role-simple.test | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/mysql-test/r/acl_roles_set_role-recursive.result b/mysql-test/r/acl_roles_set_role-recursive.result index 601999bf0c5..50a7f8494ba 100644 --- a/mysql-test/r/acl_roles_set_role-recursive.result +++ b/mysql-test/r/acl_roles_set_role-recursive.result @@ -15,14 +15,18 @@ user host test_role1 test_role2 test_user localhost -select * from mysql.roles_mapping; +select * from mysql.roles_mapping where UserFk like 'test_user'; HostFk UserFk RoleFk localhost test_user test_role1 +select * from mysql.roles_mapping where UserFk like 'test_role1'; +HostFk UserFk RoleFk test_role1 test_role2 grant select on *.* to 'test_role2'@''; -select * from mysql.user where user like 'test_role%'; +select * from mysql.user where user like 'test_role1'; Host User Password Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Reload_priv Shutdown_priv Process_priv File_priv Grant_priv References_priv Index_priv Alter_priv Show_db_priv Super_priv Create_tmp_table_priv Lock_tables_priv Execute_priv Repl_slave_priv Repl_client_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Create_user_priv Event_priv Trigger_priv Create_tablespace_priv ssl_type ssl_cipher x509_issuer x509_subject max_questions max_updates max_connections max_user_connections plugin authentication_string is_role test_role1 N N N N N N N N N N N N N N N N N N N N N N N N N N N N N 0 0 0 0 Y +select * from mysql.user where user like 'test_role2'; +Host User Password Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Reload_priv Shutdown_priv Process_priv File_priv Grant_priv References_priv Index_priv Alter_priv Show_db_priv Super_priv Create_tmp_table_priv Lock_tables_priv Execute_priv Repl_slave_priv Repl_client_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Create_user_priv Event_priv Trigger_priv Create_tablespace_priv ssl_type ssl_cipher x509_issuer x509_subject max_questions max_updates max_connections max_user_connections plugin authentication_string is_role test_role2 Y N N N N N N N N N N N N N N N N N N N N N N N N N N N N 0 0 0 0 Y flush privileges; select * from mysql.roles_mapping; diff --git a/mysql-test/r/acl_roles_set_role-simple.result b/mysql-test/r/acl_roles_set_role-simple.result index bbda2e23901..4b2cbdec28d 100644 --- a/mysql-test/r/acl_roles_set_role-simple.result +++ b/mysql-test/r/acl_roles_set_role-simple.result @@ -32,6 +32,6 @@ set role none; select * from mysql.roles_mapping; ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping' delete from mysql.user where user='test_role1'; -delete from mysql.roles_mapping where UserFk='test_role1'; -drop user 'test_user'@'localhost'; +delete from mysql.roles_mapping where RoleFk='test_role1'; flush privileges; +drop user 'test_user'@'localhost'; diff --git a/mysql-test/t/acl_roles_set_role-recursive.test b/mysql-test/t/acl_roles_set_role-recursive.test index 655176ab018..983dbb8e1e5 100644 --- a/mysql-test/t/acl_roles_set_role-recursive.test +++ b/mysql-test/t/acl_roles_set_role-recursive.test @@ -16,9 +16,11 @@ insert into mysql.roles_mapping (HostFk, UserFk, RoleFk) values ('', flush privileges; select user, host from mysql.user where user not like 'root'; -select * from mysql.roles_mapping; +select * from mysql.roles_mapping where UserFk like 'test_user'; +select * from mysql.roles_mapping where UserFk like 'test_role1'; grant select on *.* to 'test_role2'@''; -select * from mysql.user where user like 'test_role%'; +select * from mysql.user where user like 'test_role1'; +select * from mysql.user where user like 'test_role2'; flush privileges; change_user 'test_user'; diff --git a/mysql-test/t/acl_roles_set_role-simple.test b/mysql-test/t/acl_roles_set_role-simple.test index 33fd2ef6b4e..048b6916d83 100644 --- a/mysql-test/t/acl_roles_set_role-simple.test +++ b/mysql-test/t/acl_roles_set_role-simple.test @@ -29,6 +29,6 @@ select * from mysql.roles_mapping; change_user 'root'; delete from mysql.user where user='test_role1'; -delete from mysql.roles_mapping where UserFk='test_role1'; -drop user 'test_user'@'localhost'; +delete from mysql.roles_mapping where RoleFk='test_role1'; flush privileges; +drop user 'test_user'@'localhost';