Commit 5c8f3d07 authored Jan 24, 2007 by unknown

Merge polly.local:/tmp/maint/bug6774/my50-bug6774

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint

parents 2e1a8895 7d4477f8

mysql-test/r/grant.result

+2 −0

Original line number	Diff line number	Diff line
		@@ -970,4 +970,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

mysql-test/t/grant.test

+12 −0

Original line number	Diff line number	Diff line
		@@ -863,4 +863,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