diff options
| author | kaa@polly.local <> | 2007-01-25 15:50:26 +0300 |
|---|---|---|
| committer | kaa@polly.local <> | 2007-01-25 15:50:26 +0300 |
| commit | 46b3a3d7dd89d937a292bd3f7e3a3d6c6ea7f41d (patch) | |
| tree | fb926f1935c12216a8d8b518eb72c719a782cb37 | |
| parent | d554b1f725fef4ae076392cbb68b367e2f81d81d (diff) | |
| parent | e914eb690cb5efb79af05ad36e910f4a3816c883 (diff) | |
| download | mariadb-git-46b3a3d7dd89d937a292bd3f7e3a3d6c6ea7f41d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
| -rw-r--r-- | mysql-test/r/grant.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/grant.test | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index 13f9950a337..3427e441f23 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -1037,4 +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) 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) +GRANT PROCESS ON * TO user@localhost; +ERROR 3D000: No database selected End of 5.0 tests diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test index 1d8991e92a1..c4f0a09eef8 100644 --- a/mysql-test/t/grant.test +++ b/mysql-test/t/grant.test @@ -939,4 +939,16 @@ REVOKE EXECUTE ON PROCEDURE p1 FROM 1234567890abcdefGHIKL@localhost; --error ER_WRONG_STRING_LENGTH REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY; + +# +# Bug #6774: Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES +# +# Check if GRANT ... ON * ... fails when no database is selected +connect (con1, localhost, root,,*NO-ONE*) +connection con1; +--error ER_NO_DB_ERROR +GRANT PROCESS ON * TO user@localhost; +disconnect con1; +connection default; + --echo End of 5.0 tests |