Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
7c58dd80
Commit
7c58dd80
authored
Sep 08, 2014
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix another set of test failures caused by galera merge.
parent
d7fd3ffb
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
15 deletions
+15
-15
mysql-test/suite/perfschema/r/stage_mdl_function.result
mysql-test/suite/perfschema/r/stage_mdl_function.result
+1
-1
mysql-test/suite/perfschema/r/stage_mdl_procedure.result
mysql-test/suite/perfschema/r/stage_mdl_procedure.result
+1
-1
mysql-test/suite/perfschema/r/stage_mdl_table.result
mysql-test/suite/perfschema/r/stage_mdl_table.result
+1
-1
mysql-test/suite/roles/set_default_role_for.result
mysql-test/suite/roles/set_default_role_for.result
+6
-6
mysql-test/suite/roles/set_default_role_for.test
mysql-test/suite/roles/set_default_role_for.test
+6
-6
No files found.
mysql-test/suite/perfschema/r/stage_mdl_function.result
View file @
7c58dd80
...
@@ -11,7 +11,6 @@ username event_name sql_text
...
@@ -11,7 +11,6 @@ username event_name sql_text
user1 statement/sql/select select test.f1()
user1 statement/sql/select select test.f1()
username event_name nesting_event_type
username event_name nesting_event_type
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/executing STATEMENT
user1 stage/sql/Opening tables STATEMENT
user1 stage/sql/Opening tables STATEMENT
user1 stage/sql/After opening tables STATEMENT
user1 stage/sql/After opening tables STATEMENT
...
@@ -19,6 +18,7 @@ user1 stage/sql/closing tables STATEMENT
...
@@ -19,6 +18,7 @@ user1 stage/sql/closing tables STATEMENT
user1 stage/sql/end STATEMENT
user1 stage/sql/end STATEMENT
user1 stage/sql/query end STATEMENT
user1 stage/sql/query end STATEMENT
user1 stage/sql/closing tables STATEMENT
user1 stage/sql/closing tables STATEMENT
user1 stage/sql/Unlocking tables STATEMENT
user1 stage/sql/freeing items STATEMENT
user1 stage/sql/freeing items STATEMENT
user1 stage/sql/cleaning up STATEMENT
user1 stage/sql/cleaning up STATEMENT
call dump_one_thread('user2');
call dump_one_thread('user2');
...
...
mysql-test/suite/perfschema/r/stage_mdl_procedure.result
View file @
7c58dd80
...
@@ -18,7 +18,6 @@ username event_name sql_text
...
@@ -18,7 +18,6 @@ username event_name sql_text
user1 statement/sql/select select test.f1()
user1 statement/sql/select select test.f1()
username event_name nesting_event_type
username event_name nesting_event_type
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/closing tables STATEMENT
user1 stage/sql/Opening tables STATEMENT
user1 stage/sql/Opening tables STATEMENT
user1 stage/sql/After opening tables STATEMENT
user1 stage/sql/After opening tables STATEMENT
...
@@ -26,6 +25,7 @@ user1 stage/sql/closing tables STATEMENT
...
@@ -26,6 +25,7 @@ user1 stage/sql/closing tables STATEMENT
user1 stage/sql/end STATEMENT
user1 stage/sql/end STATEMENT
user1 stage/sql/query end STATEMENT
user1 stage/sql/query end STATEMENT
user1 stage/sql/closing tables STATEMENT
user1 stage/sql/closing tables STATEMENT
user1 stage/sql/Unlocking tables STATEMENT
user1 stage/sql/freeing items STATEMENT
user1 stage/sql/freeing items STATEMENT
user1 stage/sql/cleaning up STATEMENT
user1 stage/sql/cleaning up STATEMENT
call dump_one_thread('user2');
call dump_one_thread('user2');
...
...
mysql-test/suite/perfschema/r/stage_mdl_table.result
View file @
7c58dd80
...
@@ -13,7 +13,6 @@ username event_name sql_text
...
@@ -13,7 +13,6 @@ username event_name sql_text
user1 statement/sql/select select * from test.t1 for update
user1 statement/sql/select select * from test.t1 for update
username event_name nesting_event_type
username event_name nesting_event_type
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/statistics STATEMENT
user1 stage/sql/preparing STATEMENT
user1 stage/sql/preparing STATEMENT
user1 stage/sql/executing STATEMENT
user1 stage/sql/executing STATEMENT
...
@@ -21,6 +20,7 @@ user1 stage/sql/Sending data STATEMENT
...
@@ -21,6 +20,7 @@ user1 stage/sql/Sending data STATEMENT
user1 stage/sql/end STATEMENT
user1 stage/sql/end STATEMENT
user1 stage/sql/query end STATEMENT
user1 stage/sql/query end STATEMENT
user1 stage/sql/closing tables STATEMENT
user1 stage/sql/closing tables STATEMENT
user1 stage/sql/Unlocking tables STATEMENT
user1 stage/sql/freeing items STATEMENT
user1 stage/sql/freeing items STATEMENT
user1 stage/sql/cleaning up STATEMENT
user1 stage/sql/cleaning up STATEMENT
call dump_one_thread('user2');
call dump_one_thread('user2');
...
...
mysql-test/suite/roles/set_default_role_for.result
View file @
7c58dd80
...
@@ -21,17 +21,17 @@ Grants for user_a@localhost
...
@@ -21,17 +21,17 @@ Grants for user_a@localhost
GRANT role_a TO 'user_a'@'localhost'
GRANT role_a TO 'user_a'@'localhost'
GRANT USAGE ON *.* TO 'user_a'@'localhost'
GRANT USAGE ON *.* TO 'user_a'@'localhost'
GRANT SELECT ON *.* TO 'role_a'
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 host default_role
user_a localhost role_a
user_a localhost role_a
user_b localhost role_b
user_b localhost role_b
set default role NONE for current_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
;
user host default_role
user host default_role
user_a localhost
user_a localhost
user_b localhost role_b
user_b localhost role_b
set default role current_role for current_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
;
user host default_role
user host default_role
user_a localhost role_a
user_a localhost role_a
user_b localhost role_b
user_b localhost role_b
...
@@ -42,7 +42,7 @@ Grants for user_b@localhost
...
@@ -42,7 +42,7 @@ Grants for user_b@localhost
GRANT role_b TO 'user_b'@'localhost'
GRANT role_b TO 'user_b'@'localhost'
GRANT USAGE ON *.* TO 'user_b'@'localhost'
GRANT USAGE ON *.* TO 'user_b'@'localhost'
GRANT INSERT, UPDATE ON *.* TO 'role_b'
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'
ERROR 42000: SELECT command denied to user 'user_b'@'localhost' for table 'user'
insert into mysql.user (user, host) values ('someuser', 'somehost');
insert into mysql.user (user, host) values ('someuser', 'somehost');
Warnings:
Warnings:
...
@@ -56,10 +56,10 @@ Grants for user_a@localhost
...
@@ -56,10 +56,10 @@ Grants for user_a@localhost
GRANT role_a TO 'user_a'@'localhost'
GRANT role_a TO 'user_a'@'localhost'
GRANT USAGE ON *.* TO 'user_a'@'localhost'
GRANT USAGE ON *.* TO 'user_a'@'localhost'
GRANT INSERT, UPDATE ON *.* TO 'role_b'
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'
ERROR 42000: SELECT command denied to user 'user_a'@'localhost' for table 'user'
drop role role_a;
drop role role_a;
drop role role_b;
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_a@localhost;
drop user user_b@localhost;
drop user user_b@localhost;
mysql-test/suite/roles/set_default_role_for.test
View file @
7c58dd80
...
@@ -44,13 +44,13 @@ set default role role_b for user_b@localhost;
...
@@ -44,13 +44,13 @@ set default role role_b for user_b@localhost;
change_user
'user_a'
;
change_user
'user_a'
;
show
grants
;
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
;
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
;
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
# Make sure we can't set a default role not granted to us, using current_user
--
error
ER_INVALID_ROLE
--
error
ER_INVALID_ROLE
...
@@ -60,7 +60,7 @@ change_user 'user_b';
...
@@ -60,7 +60,7 @@ change_user 'user_b';
show
grants
;
show
grants
;
--
error
ER_TABLEACCESS_DENIED_ERROR
--
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.
# Make sure the default role setting worked from root.
insert
into
mysql
.
user
(
user
,
host
)
values
(
'someuser'
,
'somehost'
);
insert
into
mysql
.
user
(
user
,
host
)
values
(
'someuser'
,
'somehost'
);
...
@@ -73,12 +73,12 @@ change_user 'user_a';
...
@@ -73,12 +73,12 @@ change_user 'user_a';
# There is no default role set any more.
# There is no default role set any more.
show
grants
;
show
grants
;
--
error
ER_TABLEACCESS_DENIED_ERROR
--
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'
;
change_user
'root'
;
drop
role
role_a
;
drop
role
role_a
;
drop
role
role_b
;
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_a
@
localhost
;
drop
user
user_b
@
localhost
;
drop
user
user_b
@
localhost
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment