diff options
author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-09-08 15:12:18 +0300 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-09-08 15:12:18 +0300 |
commit | 7c58dd80e599862f42c60186c0c913cb9f64b6b6 (patch) | |
tree | 52758c24ff81ec1d5019cae1f1490330e553ff37 | |
parent | d7fd3ffb4d5d3e2dabebb9dcfb6e114ca1431aac (diff) | |
download | mariadb-git-7c58dd80e599862f42c60186c0c913cb9f64b6b6.tar.gz |
Fix another set of test failures caused by galera merge.
5 files changed, 15 insertions, 15 deletions
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_function.result b/mysql-test/suite/perfschema/r/stage_mdl_function.result index d949b19586a..098ff4f2132 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_function.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_function.result @@ -11,7 +11,6 @@ username event_name sql_text user1 statement/sql/select select test.f1() username event_name nesting_event_type username event_name nesting_event_type -user1 stage/sql/optimizing STATEMENT user1 stage/sql/executing STATEMENT user1 stage/sql/Opening tables STATEMENT user1 stage/sql/After opening tables STATEMENT @@ -19,6 +18,7 @@ user1 stage/sql/closing tables STATEMENT user1 stage/sql/end STATEMENT user1 stage/sql/query end STATEMENT user1 stage/sql/closing tables STATEMENT +user1 stage/sql/Unlocking tables STATEMENT user1 stage/sql/freeing items STATEMENT user1 stage/sql/cleaning up STATEMENT call dump_one_thread('user2'); diff --git a/mysql-test/suite/perfschema/r/stage_mdl_procedure.result b/mysql-test/suite/perfschema/r/stage_mdl_procedure.result index 263c00c98e6..1eeae4fc4fa 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_procedure.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_procedure.result @@ -18,7 +18,6 @@ username event_name sql_text user1 statement/sql/select select test.f1() username event_name nesting_event_type username event_name nesting_event_type -user1 stage/sql/query end STATEMENT user1 stage/sql/closing tables STATEMENT user1 stage/sql/Opening tables STATEMENT user1 stage/sql/After opening tables STATEMENT @@ -26,6 +25,7 @@ user1 stage/sql/closing tables STATEMENT user1 stage/sql/end STATEMENT user1 stage/sql/query end STATEMENT user1 stage/sql/closing tables STATEMENT +user1 stage/sql/Unlocking tables STATEMENT user1 stage/sql/freeing items STATEMENT user1 stage/sql/cleaning up STATEMENT call dump_one_thread('user2'); diff --git a/mysql-test/suite/perfschema/r/stage_mdl_table.result b/mysql-test/suite/perfschema/r/stage_mdl_table.result index 60e83e8a179..0699c28ac47 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_table.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_table.result @@ -13,7 +13,6 @@ username event_name sql_text user1 statement/sql/select select * from test.t1 for update username event_name nesting_event_type username event_name nesting_event_type -user1 stage/sql/optimizing STATEMENT user1 stage/sql/statistics STATEMENT user1 stage/sql/preparing STATEMENT user1 stage/sql/executing STATEMENT @@ -21,6 +20,7 @@ user1 stage/sql/Sending data STATEMENT user1 stage/sql/end STATEMENT user1 stage/sql/query end STATEMENT user1 stage/sql/closing tables STATEMENT +user1 stage/sql/Unlocking tables STATEMENT user1 stage/sql/freeing items STATEMENT user1 stage/sql/cleaning up STATEMENT call dump_one_thread('user2'); diff --git a/mysql-test/suite/roles/set_default_role_for.result b/mysql-test/suite/roles/set_default_role_for.result index 7289319a428..3e444a5f537 100644 --- a/mysql-test/suite/roles/set_default_role_for.result +++ b/mysql-test/suite/roles/set_default_role_for.result @@ -21,17 +21,17 @@ Grants for user_a@localhost GRANT role_a TO 'user_a'@'localhost' GRANT USAGE ON *.* TO 'user_a'@'localhost' GRANT SELECT ON *.* TO 'role_a' -select user, host, default_role from mysql.user where user like 'user_%'; +select user, host, default_role from mysql.user where user like 'user_%' order by user; user host default_role user_a localhost role_a user_b localhost role_b set default role NONE for current_user; -select user, host, default_role from mysql.user where user like 'user_%'; +select user, host, default_role from mysql.user where user like 'user_%' order by user; user host default_role user_a localhost user_b localhost role_b set default role current_role for current_user; -select user, host, default_role from mysql.user where user like 'user_%'; +select user, host, default_role from mysql.user where user like 'user_%' order by user; user host default_role user_a localhost role_a user_b localhost role_b @@ -42,7 +42,7 @@ Grants for user_b@localhost GRANT role_b TO 'user_b'@'localhost' GRANT USAGE ON *.* TO 'user_b'@'localhost' GRANT INSERT, UPDATE ON *.* TO 'role_b' -select user, host, default_role from mysql.user where user like 'user_%'; +select user, host, default_role from mysql.user where user like 'user_%' order by user; ERROR 42000: SELECT command denied to user 'user_b'@'localhost' for table 'user' insert into mysql.user (user, host) values ('someuser', 'somehost'); Warnings: @@ -56,10 +56,10 @@ Grants for user_a@localhost GRANT role_a TO 'user_a'@'localhost' GRANT USAGE ON *.* TO 'user_a'@'localhost' GRANT INSERT, UPDATE ON *.* TO 'role_b' -select user, host, default_role from mysql.user where user like 'user_%'; +select user, host, default_role from mysql.user where user like 'user_%' order by user; ERROR 42000: SELECT command denied to user 'user_a'@'localhost' for table 'user' drop role role_a; drop role role_b; -delete from mysql.user where user = 'someuser' && host = 'somehost'; +delete from mysql.user where user = 'someuser' && host = 'somehost' order by user; drop user user_a@localhost; drop user user_b@localhost; diff --git a/mysql-test/suite/roles/set_default_role_for.test b/mysql-test/suite/roles/set_default_role_for.test index d7a3372ae23..2e798b49733 100644 --- a/mysql-test/suite/roles/set_default_role_for.test +++ b/mysql-test/suite/roles/set_default_role_for.test @@ -44,13 +44,13 @@ set default role role_b for user_b@localhost; change_user 'user_a'; show grants; -select user, host, default_role from mysql.user where user like 'user_%'; +select user, host, default_role from mysql.user where user like 'user_%' order by user; set default role NONE for current_user; -select user, host, default_role from mysql.user where user like 'user_%'; +select user, host, default_role from mysql.user where user like 'user_%' order by user; set default role current_role for current_user; -select user, host, default_role from mysql.user where user like 'user_%'; +select user, host, default_role from mysql.user where user like 'user_%' order by user; # Make sure we can't set a default role not granted to us, using current_user --error ER_INVALID_ROLE @@ -60,7 +60,7 @@ change_user 'user_b'; show grants; --error ER_TABLEACCESS_DENIED_ERROR -select user, host, default_role from mysql.user where user like 'user_%'; +select user, host, default_role from mysql.user where user like 'user_%' order by user; # Make sure the default role setting worked from root. insert into mysql.user (user, host) values ('someuser', 'somehost'); @@ -73,12 +73,12 @@ change_user 'user_a'; # There is no default role set any more. show grants; --error ER_TABLEACCESS_DENIED_ERROR -select user, host, default_role from mysql.user where user like 'user_%'; +select user, host, default_role from mysql.user where user like 'user_%' order by user; change_user 'root'; drop role role_a; drop role role_b; -delete from mysql.user where user = 'someuser' && host = 'somehost'; +delete from mysql.user where user = 'someuser' && host = 'somehost' order by user; drop user user_a@localhost; drop user user_b@localhost; |