database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixes for mysql-test failures

Browse Source 
mysql-test/r/acl_roles_show_grants.result:
  one can do SHOW GRANTS for himself
mysql-test/t/acl_roles_set_role-table-column-priv.test:
  correct error message
mysql-test/t/acl_roles_show_grants.test:
  one can SHOW GRANTS for himself
sql/sql_acl.cc:
  bugfixing:
  * don't assign with && - it can shortcut and the second assignment won't be executed
  * correct the test in check_grant_all_columns() - want_access should not be modified
  *
sql/sql_cmd.h.OTHER:
  add new commands at the end
sql/sql_db.cc:
  don't call acl_get() if all privileges are already satisfied
  (crashes when run with --skip-grants, because acl data stuctures aren't initialized)
sql/sql_parse.cc:
  * test for current_user in get_current_user()
  * map explicitly specified user@host to current_user
This commit is contained in:
Sergei Golubchik
2013-10-18 08:10:51 -07:00
parent 8122996a59
commit 72d8b533cc
28 changed files with 145 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mysql-test/suite/funcs_1/r/is_user_privileges.result
View File

@ -129,6 +129,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser2
Password
@ -171,6 +172,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser3
Password
@ -213,6 +215,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
#
# Add GRANT OPTION db_datadict.* to testuser1;
GRANT UPDATE ON db_datadict.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
@ -279,6 +282,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser2
Password
@ -321,6 +325,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser3
Password
@ -363,6 +368,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
# Establish connection testuser1 (user=testuser1)
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''
@ -415,6 +421,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser2
Password
@ -457,6 +464,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser3
Password
@ -499,6 +507,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
SHOW GRANTS;
Grants for testuser1@localhost
GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@ -573,6 +582,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser2
Password
@ -615,6 +625,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser3
Password
@ -657,6 +668,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
#
# Here <SELECT YES> is shown correctly for testuser1;
@ -723,6 +735,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser2
Password
@ -765,6 +778,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser3
Password
@ -807,6 +821,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
# Switch to connection testuser1
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''
@ -859,6 +874,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser2
Password
@ -901,6 +917,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser3
Password
@ -943,6 +960,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
SHOW GRANTS;
Grants for testuser1@localhost
GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION
@ -1047,6 +1065,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser2
Password
@ -1089,6 +1108,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser3
Password
@ -1131,6 +1151,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
# Switch to connection testuser1
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''
@ -1230,6 +1251,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser2
Password
@ -1272,6 +1294,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser3
Password
@ -1314,6 +1337,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
# Switch to connection testuser1
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''
@ -1366,6 +1390,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser2
Password
@ -1408,6 +1433,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser3
Password
@ -1450,6 +1476,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
SHOW GRANTS;
Grants for testuser1@localhost
GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@ -1509,6 +1536,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser2
Password
@ -1551,6 +1579,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser3
Password
@ -1593,6 +1622,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
SHOW GRANTS;
Grants for testuser1@localhost
GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@ -1667,6 +1697,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser2
Password
@ -1709,6 +1740,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
Host localhost
User testuser3
Password
@ -1751,6 +1783,7 @@ max_connections 0
max_user_connections 0
plugin
authentication_string
is_role N
# Switch to connection testuser1
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''