Skip to content

M
mariadb
Commit f5ac6edf authored by unknown's avatar unknown
Browse files
Options

Fix merge error

parent 508b3f35
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/r/grant.result
View file @ f5ac6edf
...@@ -1037,8 +1037,6 @@ REVOKE EXECUTE ON PROCEDURE p1 FROM 1234567890abcdefGHIKL@localhost; ...@@ -1037,8 +1037,6 @@ REVOKE EXECUTE ON PROCEDURE p1 FROM 1234567890abcdefGHIKL@localhost;
ERROR HY000: String '1234567890abcdefGHIKL' is too long for user name (should be no longer than 16) ERROR HY000: String '1234567890abcdefGHIKL' is too long for user name (should be no longer than 16)
REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60) ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)
GRANT PROCESS ON * TO user@localhost;
ERROR 3D000: No database selected
CREATE USER bug23556@localhost; CREATE USER bug23556@localhost;
CREATE DATABASE bug23556; CREATE DATABASE bug23556;
GRANT SELECT ON bug23556.* TO bug23556@localhost; GRANT SELECT ON bug23556.* TO bug23556@localhost;
...@@ -1059,4 +1057,6 @@ DROP TABLE t1; ...@@ -1059,4 +1057,6 @@ DROP TABLE t1;
USE test; USE test;
DROP DATABASE bug23556; DROP DATABASE bug23556;
DROP USER bug23556@localhost; DROP USER bug23556@localhost;
GRANT PROCESS ON * TO user@localhost;
ERROR 3D000: No database selected
End of 5.0 tests End of 5.0 tests
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7