bk commit into 5.1 tree (kostja:1.2275)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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-14 19:05:35+04:00, kostja@stripped +2 -0
  Fix a test suite failure.

  mysql-test/r/partition_grant.result@stripped, 2006-08-14 19:05:32+04:00, kostja@stripped +2 -0
    Update results (cleanup pon top of partition_grant.test)

  mysql-test/t/partition_grant.test@stripped, 2006-08-14 19:05:32+04:00, kostja@stripped +8 -0
    Fix a test suite failure.

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-runtime-merge

--- 1.1/mysql-test/r/partition_grant.result	2006-08-14 19:05:47 +04:00
+++ 1.2/mysql-test/r/partition_grant.result	2006-08-14 19:05:47 +04:00
@@ -3,6 +3,8 @@ create schema mysqltest_1;
 use mysqltest_1;
 create table t1 (a int) partition by list (a) (partition p1 values in (1), partition p2 values in (2), partition p3 values in (3));
 insert into t1 values (1),(2);
+grant usage on *.* to mysqltest_1@localhost;
+revoke all privileges on *.* from mysqltest_1@localhost;
 grant select,alter on mysqltest_1.* to mysqltest_1@localhost;
 show grants for current_user;
 Grants for mysqltest_1@localhost

--- 1.1/mysql-test/t/partition_grant.test	2006-08-14 19:05:47 +04:00
+++ 1.2/mysql-test/t/partition_grant.test	2006-08-14 19:05:47 +04:00
@@ -17,6 +17,14 @@ use mysqltest_1;
 create table t1 (a int) partition by list (a) (partition p1 values in (1), partition p2 values in (2), partition p3 values in (3));
 insert into t1 values (1),(2);
 
+# We don't have DROP USER IF EXISTS. Use this workaround to
+# cleanup possible grants for mysqltest_1 left by previous tests
+# and ensure consistent results of SHOW GRANTS command below.
+--disable_warnings
+grant usage on *.* to mysqltest_1@localhost;
+revoke all privileges on *.* from mysqltest_1@localhost;
+--enable_warnings
+
 grant select,alter on mysqltest_1.* to mysqltest_1@localhost;
 
 connect (conn1,localhost,mysqltest_1,,mysqltest_1);