bk commit into 5.1 tree (kaa:1.2431)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-24 17:12:42+03:00, kaa@stripped +2 -0
  Merge polly.local:/tmp/maint/bug6774/my50-bug6774
  into  polly.local:/tmp/maint/bug6774/my51-bug6774
  MERGE: 1.1810.2485.6

  mysql-test/r/grant.result@stripped, 2007-01-24 17:12:38+03:00, kaa@stripped +2 -2
    Manual merge
    MERGE: 1.37.1.24

  mysql-test/t/grant.test@stripped, 2007-01-24 17:12:38+03:00, kaa@stripped +0 -0
    Manual merge
    MERGE: 1.41.1.10

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kaa
# Host:	polly.local
# Root:	/tmp/maint/bug6774/my51-bug6774/RESYNC

--- 1.62/mysql-test/r/grant.result	2007-01-24 17:12:52 +03:00
+++ 1.63/mysql-test/r/grant.result	2007-01-24 17:12:52 +03:00
@@ -1037,4 +1037,6 @@ REVOKE EXECUTE ON PROCEDURE p1 FROM 1234
 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

--- 1.49/mysql-test/t/grant.test	2007-01-24 17:12:53 +03:00
+++ 1.50/mysql-test/t/grant.test	2007-01-24 17:12:53 +03:00
@@ -939,4 +939,16 @@ REVOKE EXECUTE ON PROCEDURE p1 FROM 1234
 
 --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