diff options
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 1 | ||||
-rw-r--r-- | mysql-test/suite/roles/admin.result (renamed from mysql-test/r/acl_roles_admin.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/admin.test (renamed from mysql-test/t/acl_roles_admin.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/create_and_drop_role.result (renamed from mysql-test/r/acl_roles_create_and_drop_role.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/create_and_drop_role.test (renamed from mysql-test/t/acl_roles_create_and_drop_role.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/create_and_drop_role_invalid_user_table.result (renamed from mysql-test/r/acl_roles_create_and_drop_role_invalid_user_table.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test (renamed from mysql-test/t/acl_roles_create_and_drop_role_invalid_user_table.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/create_and_grant_role.result (renamed from mysql-test/r/acl_roles_create_and_grant_role.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/create_and_grant_role.test (renamed from mysql-test/t/acl_roles_create_and_grant_role.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/default_create_user_not_role.result (renamed from mysql-test/r/acl_roles_default_create_user_not_role.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/default_create_user_not_role.test (renamed from mysql-test/t/acl_roles_default_create_user_not_role.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/definer.result (renamed from mysql-test/r/acl_roles_definer.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/definer.test (renamed from mysql-test/t/acl_roles_definer.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/none_public.result (renamed from mysql-test/r/acl_roles_none_public.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/none_public.test (renamed from mysql-test/t/acl_roles_none_public.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/rebuild_role_grants.result (renamed from mysql-test/r/acl_roles_rebuild_role_grants.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/rebuild_role_grants.test (renamed from mysql-test/t/acl_roles_rebuild_role_grants.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/recursive.inc (renamed from mysql-test/include/acl_roles_recursive.inc) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/recursive.result (renamed from mysql-test/r/acl_roles_recursive.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/recursive.test | 4 | ||||
-rw-r--r-- | mysql-test/suite/roles/recursive_dbug.result (renamed from mysql-test/r/acl_roles_recursive_dbug.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/recursive_dbug.test (renamed from mysql-test/t/acl_roles_recursive_dbug.test) | 2 | ||||
-rw-r--r-- | mysql-test/suite/roles/rename_user.result (renamed from mysql-test/r/acl_roles_rename_user.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/rename_user.test (renamed from mysql-test/t/acl_roles_rename_user.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/rpl_definer.result (renamed from mysql-test/r/acl_roles_rpl_definer.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/rpl_definer.test (renamed from mysql-test/t/acl_roles_rpl_definer.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-database-recursive.result (renamed from mysql-test/r/acl_roles_set_role-database-recursive.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-database-recursive.test (renamed from mysql-test/t/acl_roles_set_role-database-recursive.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-database-simple.result (renamed from mysql-test/r/acl_roles_set_role-database-simple.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-database-simple.test (renamed from mysql-test/t/acl_roles_set_role-database-simple.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-multiple-role.result (renamed from mysql-test/r/acl_roles_set_role-multiple-role.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-multiple-role.test (renamed from mysql-test/t/acl_roles_set_role-multiple-role.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-recursive.result (renamed from mysql-test/r/acl_roles_set_role-recursive.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-recursive.test (renamed from mysql-test/t/acl_roles_set_role-recursive.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-routine-simple.result (renamed from mysql-test/r/acl_roles_set_role-routine-simple.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-routine-simple.test (renamed from mysql-test/t/acl_roles_set_role-routine-simple.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-simple.result (renamed from mysql-test/r/acl_roles_set_role-simple.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-simple.test (renamed from mysql-test/t/acl_roles_set_role-simple.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-table-column-priv.result (renamed from mysql-test/r/acl_roles_set_role-table-column-priv.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-table-column-priv.test (renamed from mysql-test/t/acl_roles_set_role-table-column-priv.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-table-simple.result (renamed from mysql-test/r/acl_roles_set_role-table-simple.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/set_role-table-simple.test (renamed from mysql-test/t/acl_roles_set_role-table-simple.test) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/show_grants.result (renamed from mysql-test/r/acl_roles_show_grants.result) | 0 | ||||
-rw-r--r-- | mysql-test/suite/roles/show_grants.test (renamed from mysql-test/t/acl_roles_show_grants.test) | 0 | ||||
-rw-r--r-- | mysql-test/t/acl_roles_recursive.test | 4 |
45 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 169aff3f3e9..9c4b1142ecc 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -181,6 +181,7 @@ my $DEFAULT_SUITES= join(',', map { "$_-" } qw( percona perfschema plugins + roles rpl sphinx sys_vars diff --git a/mysql-test/r/acl_roles_admin.result b/mysql-test/suite/roles/admin.result index ad3d4125252..ad3d4125252 100644 --- a/mysql-test/r/acl_roles_admin.result +++ b/mysql-test/suite/roles/admin.result diff --git a/mysql-test/t/acl_roles_admin.test b/mysql-test/suite/roles/admin.test index 03f3449200b..03f3449200b 100644 --- a/mysql-test/t/acl_roles_admin.test +++ b/mysql-test/suite/roles/admin.test diff --git a/mysql-test/r/acl_roles_create_and_drop_role.result b/mysql-test/suite/roles/create_and_drop_role.result index d4eac2756ec..d4eac2756ec 100644 --- a/mysql-test/r/acl_roles_create_and_drop_role.result +++ b/mysql-test/suite/roles/create_and_drop_role.result diff --git a/mysql-test/t/acl_roles_create_and_drop_role.test b/mysql-test/suite/roles/create_and_drop_role.test index 3491986e666..3491986e666 100644 --- a/mysql-test/t/acl_roles_create_and_drop_role.test +++ b/mysql-test/suite/roles/create_and_drop_role.test diff --git a/mysql-test/r/acl_roles_create_and_drop_role_invalid_user_table.result b/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.result index 569997adde0..569997adde0 100644 --- a/mysql-test/r/acl_roles_create_and_drop_role_invalid_user_table.result +++ b/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.result diff --git a/mysql-test/t/acl_roles_create_and_drop_role_invalid_user_table.test b/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test index 8d2a421cf39..8d2a421cf39 100644 --- a/mysql-test/t/acl_roles_create_and_drop_role_invalid_user_table.test +++ b/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test diff --git a/mysql-test/r/acl_roles_create_and_grant_role.result b/mysql-test/suite/roles/create_and_grant_role.result index 883ae44397d..883ae44397d 100644 --- a/mysql-test/r/acl_roles_create_and_grant_role.result +++ b/mysql-test/suite/roles/create_and_grant_role.result diff --git a/mysql-test/t/acl_roles_create_and_grant_role.test b/mysql-test/suite/roles/create_and_grant_role.test index 5b32150389e..5b32150389e 100644 --- a/mysql-test/t/acl_roles_create_and_grant_role.test +++ b/mysql-test/suite/roles/create_and_grant_role.test diff --git a/mysql-test/r/acl_roles_default_create_user_not_role.result b/mysql-test/suite/roles/default_create_user_not_role.result index 1ddb054c092..1ddb054c092 100644 --- a/mysql-test/r/acl_roles_default_create_user_not_role.result +++ b/mysql-test/suite/roles/default_create_user_not_role.result diff --git a/mysql-test/t/acl_roles_default_create_user_not_role.test b/mysql-test/suite/roles/default_create_user_not_role.test index d3a432892db..d3a432892db 100644 --- a/mysql-test/t/acl_roles_default_create_user_not_role.test +++ b/mysql-test/suite/roles/default_create_user_not_role.test diff --git a/mysql-test/r/acl_roles_definer.result b/mysql-test/suite/roles/definer.result index 0010853be78..0010853be78 100644 --- a/mysql-test/r/acl_roles_definer.result +++ b/mysql-test/suite/roles/definer.result diff --git a/mysql-test/t/acl_roles_definer.test b/mysql-test/suite/roles/definer.test index 3c069105c8c..3c069105c8c 100644 --- a/mysql-test/t/acl_roles_definer.test +++ b/mysql-test/suite/roles/definer.test diff --git a/mysql-test/r/acl_roles_none_public.result b/mysql-test/suite/roles/none_public.result index a0c7a0db707..a0c7a0db707 100644 --- a/mysql-test/r/acl_roles_none_public.result +++ b/mysql-test/suite/roles/none_public.result diff --git a/mysql-test/t/acl_roles_none_public.test b/mysql-test/suite/roles/none_public.test index 8e370d80007..8e370d80007 100644 --- a/mysql-test/t/acl_roles_none_public.test +++ b/mysql-test/suite/roles/none_public.test diff --git a/mysql-test/r/acl_roles_rebuild_role_grants.result b/mysql-test/suite/roles/rebuild_role_grants.result index 2817c046ae9..2817c046ae9 100644 --- a/mysql-test/r/acl_roles_rebuild_role_grants.result +++ b/mysql-test/suite/roles/rebuild_role_grants.result diff --git a/mysql-test/t/acl_roles_rebuild_role_grants.test b/mysql-test/suite/roles/rebuild_role_grants.test index 3ec3577317a..3ec3577317a 100644 --- a/mysql-test/t/acl_roles_rebuild_role_grants.test +++ b/mysql-test/suite/roles/rebuild_role_grants.test diff --git a/mysql-test/include/acl_roles_recursive.inc b/mysql-test/suite/roles/recursive.inc index 940a3c9e0db..940a3c9e0db 100644 --- a/mysql-test/include/acl_roles_recursive.inc +++ b/mysql-test/suite/roles/recursive.inc diff --git a/mysql-test/r/acl_roles_recursive.result b/mysql-test/suite/roles/recursive.result index ef40c97865f..ef40c97865f 100644 --- a/mysql-test/r/acl_roles_recursive.result +++ b/mysql-test/suite/roles/recursive.result diff --git a/mysql-test/suite/roles/recursive.test b/mysql-test/suite/roles/recursive.test new file mode 100644 index 00000000000..0858f868d42 --- /dev/null +++ b/mysql-test/suite/roles/recursive.test @@ -0,0 +1,4 @@ + +source include/not_debug.inc; +source recursive.inc; + diff --git a/mysql-test/r/acl_roles_recursive_dbug.result b/mysql-test/suite/roles/recursive_dbug.result index 268ef47232e..268ef47232e 100644 --- a/mysql-test/r/acl_roles_recursive_dbug.result +++ b/mysql-test/suite/roles/recursive_dbug.result diff --git a/mysql-test/t/acl_roles_recursive_dbug.test b/mysql-test/suite/roles/recursive_dbug.test index 852eafa0035..811695994e0 100644 --- a/mysql-test/t/acl_roles_recursive_dbug.test +++ b/mysql-test/suite/roles/recursive_dbug.test @@ -8,7 +8,7 @@ show status like 'debug%'; set @old_dbug=@@global.debug_dbug; set global debug_dbug="+d,role_merge_stats"; -source include/acl_roles_recursive.inc; +source recursive.inc; set global debug_dbug=@old_dbug; diff --git a/mysql-test/r/acl_roles_rename_user.result b/mysql-test/suite/roles/rename_user.result index 987d90a5820..987d90a5820 100644 --- a/mysql-test/r/acl_roles_rename_user.result +++ b/mysql-test/suite/roles/rename_user.result diff --git a/mysql-test/t/acl_roles_rename_user.test b/mysql-test/suite/roles/rename_user.test index 45429b76666..45429b76666 100644 --- a/mysql-test/t/acl_roles_rename_user.test +++ b/mysql-test/suite/roles/rename_user.test diff --git a/mysql-test/r/acl_roles_rpl_definer.result b/mysql-test/suite/roles/rpl_definer.result index eadb6315d9b..eadb6315d9b 100644 --- a/mysql-test/r/acl_roles_rpl_definer.result +++ b/mysql-test/suite/roles/rpl_definer.result diff --git a/mysql-test/t/acl_roles_rpl_definer.test b/mysql-test/suite/roles/rpl_definer.test index 86d69de86aa..86d69de86aa 100644 --- a/mysql-test/t/acl_roles_rpl_definer.test +++ b/mysql-test/suite/roles/rpl_definer.test diff --git a/mysql-test/r/acl_roles_set_role-database-recursive.result b/mysql-test/suite/roles/set_role-database-recursive.result index 479e553c3d1..479e553c3d1 100644 --- a/mysql-test/r/acl_roles_set_role-database-recursive.result +++ b/mysql-test/suite/roles/set_role-database-recursive.result diff --git a/mysql-test/t/acl_roles_set_role-database-recursive.test b/mysql-test/suite/roles/set_role-database-recursive.test index 17c93d4571f..17c93d4571f 100644 --- a/mysql-test/t/acl_roles_set_role-database-recursive.test +++ b/mysql-test/suite/roles/set_role-database-recursive.test diff --git a/mysql-test/r/acl_roles_set_role-database-simple.result b/mysql-test/suite/roles/set_role-database-simple.result index e21a55edf2e..e21a55edf2e 100644 --- a/mysql-test/r/acl_roles_set_role-database-simple.result +++ b/mysql-test/suite/roles/set_role-database-simple.result diff --git a/mysql-test/t/acl_roles_set_role-database-simple.test b/mysql-test/suite/roles/set_role-database-simple.test index daac13a095d..daac13a095d 100644 --- a/mysql-test/t/acl_roles_set_role-database-simple.test +++ b/mysql-test/suite/roles/set_role-database-simple.test diff --git a/mysql-test/r/acl_roles_set_role-multiple-role.result b/mysql-test/suite/roles/set_role-multiple-role.result index fca53b4d645..fca53b4d645 100644 --- a/mysql-test/r/acl_roles_set_role-multiple-role.result +++ b/mysql-test/suite/roles/set_role-multiple-role.result diff --git a/mysql-test/t/acl_roles_set_role-multiple-role.test b/mysql-test/suite/roles/set_role-multiple-role.test index ecfe8869c12..ecfe8869c12 100644 --- a/mysql-test/t/acl_roles_set_role-multiple-role.test +++ b/mysql-test/suite/roles/set_role-multiple-role.test diff --git a/mysql-test/r/acl_roles_set_role-recursive.result b/mysql-test/suite/roles/set_role-recursive.result index a4442d8caa3..a4442d8caa3 100644 --- a/mysql-test/r/acl_roles_set_role-recursive.result +++ b/mysql-test/suite/roles/set_role-recursive.result diff --git a/mysql-test/t/acl_roles_set_role-recursive.test b/mysql-test/suite/roles/set_role-recursive.test index 23d623e1966..23d623e1966 100644 --- a/mysql-test/t/acl_roles_set_role-recursive.test +++ b/mysql-test/suite/roles/set_role-recursive.test diff --git a/mysql-test/r/acl_roles_set_role-routine-simple.result b/mysql-test/suite/roles/set_role-routine-simple.result index 3e17a78ad77..3e17a78ad77 100644 --- a/mysql-test/r/acl_roles_set_role-routine-simple.result +++ b/mysql-test/suite/roles/set_role-routine-simple.result diff --git a/mysql-test/t/acl_roles_set_role-routine-simple.test b/mysql-test/suite/roles/set_role-routine-simple.test index 0e808d190d6..0e808d190d6 100644 --- a/mysql-test/t/acl_roles_set_role-routine-simple.test +++ b/mysql-test/suite/roles/set_role-routine-simple.test diff --git a/mysql-test/r/acl_roles_set_role-simple.result b/mysql-test/suite/roles/set_role-simple.result index 9a4ab4d6bb5..9a4ab4d6bb5 100644 --- a/mysql-test/r/acl_roles_set_role-simple.result +++ b/mysql-test/suite/roles/set_role-simple.result diff --git a/mysql-test/t/acl_roles_set_role-simple.test b/mysql-test/suite/roles/set_role-simple.test index 152a1d0eb25..152a1d0eb25 100644 --- a/mysql-test/t/acl_roles_set_role-simple.test +++ b/mysql-test/suite/roles/set_role-simple.test diff --git a/mysql-test/r/acl_roles_set_role-table-column-priv.result b/mysql-test/suite/roles/set_role-table-column-priv.result index 721bd3039a3..721bd3039a3 100644 --- a/mysql-test/r/acl_roles_set_role-table-column-priv.result +++ b/mysql-test/suite/roles/set_role-table-column-priv.result diff --git a/mysql-test/t/acl_roles_set_role-table-column-priv.test b/mysql-test/suite/roles/set_role-table-column-priv.test index e154b259b04..e154b259b04 100644 --- a/mysql-test/t/acl_roles_set_role-table-column-priv.test +++ b/mysql-test/suite/roles/set_role-table-column-priv.test diff --git a/mysql-test/r/acl_roles_set_role-table-simple.result b/mysql-test/suite/roles/set_role-table-simple.result index f5688dbe62e..f5688dbe62e 100644 --- a/mysql-test/r/acl_roles_set_role-table-simple.result +++ b/mysql-test/suite/roles/set_role-table-simple.result diff --git a/mysql-test/t/acl_roles_set_role-table-simple.test b/mysql-test/suite/roles/set_role-table-simple.test index 8de7781927a..8de7781927a 100644 --- a/mysql-test/t/acl_roles_set_role-table-simple.test +++ b/mysql-test/suite/roles/set_role-table-simple.test diff --git a/mysql-test/r/acl_roles_show_grants.result b/mysql-test/suite/roles/show_grants.result index e7b7860c74f..e7b7860c74f 100644 --- a/mysql-test/r/acl_roles_show_grants.result +++ b/mysql-test/suite/roles/show_grants.result diff --git a/mysql-test/t/acl_roles_show_grants.test b/mysql-test/suite/roles/show_grants.test index 9c15d8b8b2b..9c15d8b8b2b 100644 --- a/mysql-test/t/acl_roles_show_grants.test +++ b/mysql-test/suite/roles/show_grants.test diff --git a/mysql-test/t/acl_roles_recursive.test b/mysql-test/t/acl_roles_recursive.test deleted file mode 100644 index 8d7077772eb..00000000000 --- a/mysql-test/t/acl_roles_recursive.test +++ /dev/null @@ -1,4 +0,0 @@ - -source include/not_debug.inc; -source include/acl_roles_recursive.inc; - |