diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-03 15:57:23 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-03 15:57:23 +0300 |
| commit | 05459706f22b1d9d22abd24e6de3b505d787beb3 (patch) | |
| tree | 3e850e0cbf5489fbf36f5c1579248e344bfe2395 /mysql-test/main/grant.result | |
| parent | 8ae2a2dbe6fc52d40ec88c325b9a44de52f83f2f (diff) | |
| parent | e6a808bec790fdbbf1dc0a6b03fb6c8b6e41dc01 (diff) | |
| download | mariadb-git-05459706f22b1d9d22abd24e6de3b505d787beb3.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/grant.result')
| -rw-r--r-- | mysql-test/main/grant.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/grant.result b/mysql-test/main/grant.result index 1279bcdd41e..ba2d595a50e 100644 --- a/mysql-test/main/grant.result +++ b/mysql-test/main/grant.result @@ -1757,6 +1757,7 @@ drop user mysqltest@localhost; disconnect user1; drop database mysqltest; use test; +call mtr.add_suppression("Can't open and lock privilege tables"); FLUSH PRIVILEGES without procs_priv table. RENAME TABLE mysql.procs_priv TO mysql.procs_gone; FLUSH PRIVILEGES; @@ -1850,8 +1851,6 @@ BEGIN SET @x = 0; REPEAT SET @x = @x + 1; UNTIL @x > p1 END REPEAT; END ;|| -Warnings: -Warning 1404 Failed to grant EXECUTE and ALTER ROUTINE privileges connection default; SHOW GRANTS FOR 'user1'@'localhost'; Grants for user1@localhost @@ -1862,6 +1861,7 @@ SHOW GRANTS FOR 'user2'; Grants for user2@% GRANT USAGE ON *.* TO 'user2'@'%' GRANT CREATE, CREATE ROUTINE ON `db1`.* TO 'user2'@'%' +GRANT EXECUTE, ALTER ROUTINE ON PROCEDURE `db1`.`proc2` TO 'user2'@'%' disconnect con1; disconnect con2; DROP PROCEDURE db1.proc1; |