bk commit into 5.1 tree (msvensson:1.2510)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-06-01 14:12:16+02:00, msvensson@pilot.(none) +1 -0
  Fiux syntax errors in grant.test, connect command with both -- and ;
  only one of those is allowed

  mysql-test/t/grant.test@stripped, 2007-06-01 14:12:13+02:00, msvensson@pilot.(none) +6 -6
    Fiux syntax errors in grant.test, connect command with both -- and ;
    only one of those is allowed

# 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:	msvensson
# Host:	pilot.(none)
# Root:	/data/msvensson/mysql/bug28497/my51-bug28497

--- 1.60/mysql-test/t/grant.test	2007-06-01 13:50:56 +02:00
+++ 1.61/mysql-test/t/grant.test	2007-06-01 14:12:13 +02:00
@@ -862,7 +862,7 @@ CREATE TABLE mysqltest1.t2 (int_field IN
 CREATE USER mysqltest_1@localhost;
 GRANT SELECT ON mysqltest1.t1 TO mysqltest_1@localhost;
 
---connect (conn42,localhost,mysqltest_1,,mysqltest1);
+connect (conn42,localhost,mysqltest_1,,mysqltest1);
 SELECT USER();
 SHOW GRANTS;
 --error ER_TABLEACCESS_DENIED_ERROR
@@ -873,7 +873,7 @@ ALTER TABLE t1 RENAME TO t2;
 --connection default
 GRANT DROP ON mysqltest1.t1 TO mysqltest_1@localhost;
 
---connect (conn42,localhost,mysqltest_1,,mysqltest1);
+connect (conn42,localhost,mysqltest_1,,mysqltest1);
 --error ER_TABLEACCESS_DENIED_ERROR
 RENAME TABLE t1 TO t2;
 --error ER_TABLEACCESS_DENIED_ERROR
@@ -882,7 +882,7 @@ ALTER TABLE t1 RENAME TO t2;
 --connection default
 GRANT ALTER ON mysqltest1.t1 TO mysqltest_1@localhost;
 
---connect (conn42,localhost,mysqltest_1,,mysqltest1);
+connect (conn42,localhost,mysqltest_1,,mysqltest1);
 SHOW GRANTS;
 --error ER_TABLEACCESS_DENIED_ERROR
 RENAME TABLE t1 TO t2;
@@ -891,7 +891,7 @@ ALTER TABLE t1 RENAME TO t2;
 --disconnect conn42
 --connection default
 GRANT INSERT, CREATE ON mysqltest1.t1 TO mysqltest_1@localhost;
---connect (conn42,localhost,mysqltest_1,,mysqltest1);
+connect (conn42,localhost,mysqltest_1,,mysqltest1);
 SHOW GRANTS;
 --error ER_TABLEACCESS_DENIED_ERROR
 --disconnect conn42
@@ -899,7 +899,7 @@ SHOW GRANTS;
 GRANT INSERT, SELECT, CREATE, ALTER, DROP ON mysqltest1.t2 TO mysqltest_1@localhost;
 DROP TABLE mysqltest1.t2;
 
---connect (conn42,localhost,mysqltest_1,,mysqltest1);
+connect (conn42,localhost,mysqltest_1,,mysqltest1);
 SHOW GRANTS;
 RENAME TABLE t1 TO t2;
 RENAME TABLE t2 TO t1;
@@ -910,7 +910,7 @@ ALTER TABLE t2 RENAME TO t1;
 REVOKE DROP, INSERT ON mysqltest1.t1 FROM mysqltest_1@localhost;
 REVOKE DROP, INSERT ON mysqltest1.t2 FROM mysqltest_1@localhost;
 
---connect (conn42,localhost,mysqltest_1,,mysqltest1);
+connect (conn42,localhost,mysqltest_1,,mysqltest1);
 SHOW GRANTS;
 --error ER_TABLEACCESS_DENIED_ERROR
 RENAME TABLE t1 TO t2;