bk commit into 5.1 tree (igor:1.2524)

[igor]

Below is the list of changes that have just been committed into a local
5.1 repository of igor. When igor 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-05-11 21:51:14-07:00, igor@stripped +2 -0
  Merge olga.mysql.com:/home/igor/mysql-5.0-opt
  into  olga.mysql.com:/home/igor/mysql-5.1-opt
  MERGE: 1.1810.2868.46

  mysql-test/r/grant.result@stripped, 2007-05-11 21:49:55-07:00, igor@stripped +0 -1
    Manual merge
    MERGE: 1.37.1.29

  mysql-test/t/grant.test@stripped, 2007-05-11 21:44:15-07:00, igor@stripped +0 -0
    Auto merged
    MERGE: 1.41.1.15

# 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:	igor
# Host:	olga.mysql.com
# Root:	/home/igor/mysql-5.1-opt/RESYNC

--- 1.58/mysql-test/t/grant.test	2007-05-11 21:51:21 -07:00
+++ 1.59/mysql-test/t/grant.test	2007-05-11 21:51:21 -07:00
@@ -1257,7 +1257,7 @@
 SELECT * FROM test.t1;
 disconnect user1;
 connection default;
-DROP VIEW v1;
+DROP DATABASE db27878;
 use test;
 DROP TABLE t1;