bk commit into 5.0 tree (jimw:1.2259)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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, 2006-08-16 10:11:23-07:00, jimw@rama.(none) +2 -0
  Merge bk-internal:/home/bk/mysql-5.0
  into  rama.(none):/home/jimw/my/mysql-5.0-clean
  MERGE: 1.2237.1.1

  mysql-test/r/grant.result@stripped, 2006-08-16 10:11:20-07:00, jimw@rama.(none) +0 -0
    Auto merged
    MERGE: 1.52.1.2

  mysql-test/t/grant.test@stripped, 2006-08-16 10:11:20-07:00, jimw@rama.(none) +0 -0
    Auto merged
    MERGE: 1.41.1.2

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.53/mysql-test/r/grant.result	2006-08-16 10:11:26 -07:00
+++ 1.54/mysql-test/r/grant.result	2006-08-16 10:11:26 -07:00
@@ -426,6 +426,7 @@ revoke all on mysqltest_2.t1 from mysqlt
 revoke all on mysqltest_2.t2 from mysqltest_3@localhost;
 grant all on mysqltest_2.* to mysqltest_3@localhost;
 grant select on *.* to mysqltest_3@localhost;
+grant select on mysqltest_2.t1 to mysqltest_3@localhost;
 flush privileges;
 use mysqltest_1;
 update mysqltest_2.t1, mysqltest_2.t2 set c=500,d=600;

--- 1.42/mysql-test/t/grant.test	2006-08-16 10:11:26 -07:00
+++ 1.43/mysql-test/t/grant.test	2006-08-16 10:11:26 -07:00
@@ -362,6 +362,8 @@ revoke all on mysqltest_2.t2 from mysqlt
 #test the db/table level privileges
 grant all on mysqltest_2.* to mysqltest_3@localhost;
 grant select on *.* to mysqltest_3@localhost;
+# Next grant is needed to trigger bug#7391. Do not optimize!
+grant select on mysqltest_2.t1 to mysqltest_3@localhost;
 flush privileges;
 disconnect conn1;
 connect (conn2,localhost,mysqltest_3,,);