1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

10.0-base merge (roles)

This commit is contained in:
Sergei Golubchik
2013-10-29 15:08:44 +01:00
248 changed files with 10725 additions and 1899 deletions

View File

@ -28,21 +28,21 @@ DROP FUNCTION test.f1;
#########################################################################
DESCRIBE information_schema.USER_PRIVILEGES;
Field Type Null Key Default Extra
GRANTEE varchar(81) NO
GRANTEE varchar(190) NO
TABLE_CATALOG varchar(512) NO
PRIVILEGE_TYPE varchar(64) NO
IS_GRANTABLE varchar(3) NO
SHOW CREATE TABLE information_schema.USER_PRIVILEGES;
Table Create Table
USER_PRIVILEGES CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
`GRANTEE` varchar(81) NOT NULL DEFAULT '',
`GRANTEE` varchar(190) NOT NULL DEFAULT '',
`TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
`PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
`IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.USER_PRIVILEGES;
Field Type Null Key Default Extra
GRANTEE varchar(81) NO
GRANTEE varchar(190) NO
TABLE_CATALOG varchar(512) NO
PRIVILEGE_TYPE varchar(64) NO
IS_GRANTABLE varchar(3) NO
@ -130,6 +130,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser2
Password
@ -173,6 +174,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser3
Password
@ -216,6 +218,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
#
# Add GRANT OPTION db_datadict.* to testuser1;
GRANT UPDATE ON db_datadict.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
@ -283,6 +286,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser2
Password
@ -326,6 +330,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser3
Password
@ -369,6 +374,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
# Establish connection testuser1 (user=testuser1)
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''
@ -422,6 +428,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser2
Password
@ -465,6 +472,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser3
Password
@ -508,6 +516,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
SHOW GRANTS;
Grants for testuser1@localhost
GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@ -583,6 +592,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser2
Password
@ -626,6 +636,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser3
Password
@ -669,6 +680,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
#
# Here <SELECT YES> is shown correctly for testuser1;
@ -736,6 +748,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser2
Password
@ -779,6 +792,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser3
Password
@ -822,6 +836,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
# Switch to connection testuser1
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''
@ -875,6 +890,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser2
Password
@ -918,6 +934,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser3
Password
@ -961,6 +978,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
SHOW GRANTS;
Grants for testuser1@localhost
GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION
@ -1066,6 +1084,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser2
Password
@ -1109,6 +1128,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser3
Password
@ -1152,6 +1172,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
# Switch to connection testuser1
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''
@ -1252,6 +1273,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser2
Password
@ -1295,6 +1317,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser3
Password
@ -1338,6 +1361,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
# Switch to connection testuser1
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''
@ -1391,6 +1415,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser2
Password
@ -1434,6 +1459,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser3
Password
@ -1477,6 +1503,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
SHOW GRANTS;
Grants for testuser1@localhost
GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@ -1537,6 +1564,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser2
Password
@ -1580,6 +1608,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser3
Password
@ -1623,6 +1652,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
SHOW GRANTS;
Grants for testuser1@localhost
GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@ -1698,6 +1728,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser2
Password
@ -1741,6 +1772,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
Host localhost
User testuser3
Password
@ -1784,6 +1816,7 @@ max_user_connections 0
plugin
authentication_string
password_expired N
is_role N
# Switch to connection testuser1
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''