bk commit into 5.2 tree (anozdrin:1.2099)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.2 repository of alik. When alik 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
  1.2099 06/02/09 16:40:44 anozdrin@stripped +1 -0
  Fix the error of 5.1 -> 5.2 merge of bugs 15166/15196.

  mysql-test/t/trigger-grant.test
    1.6 06/02/09 16:40:41 anozdrin@stripped +1 -3
    Fix the test suite.

# 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:	anozdrin
# Host:	station.home
# Root:	/home/alik/Documents/AllProgs/MySQL/devel/5.2-tree

--- 1.5/mysql-test/t/trigger-grant.test	2006-02-07 13:38:40 +03:00
+++ 1.6/mysql-test/t/trigger-grant.test	2006-02-09 16:40:41 +03:00
@@ -424,8 +424,7 @@
 
 CREATE USER mysqltest_u1@localhost;
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_u1@localhost;
-GRANT SUPER ON *.* TO mysqltest_u1@localhost;
-GRANT SELECT ON mysqltest_db1.t1 TO mysqltest_u1@localhost; # to allow connect
+GRANT TRIGGER ON mysqltest_db1.* TO mysqltest_u1@localhost;
 
 SET @mysqltest_var = NULL;
 
@@ -441,7 +440,6 @@
 
 use mysqltest_db1;
 
-REVOKE SELECT ON mysqltest_db1.t1 FROM mysqltest_u1@localhost;
 GRANT DELETE ON mysqltest_db1.* TO mysqltest_u1@localhost;
 SHOW GRANTS FOR mysqltest_u1@localhost;