From e7f7263d489c1c4aa14bff0b7d12903bd40d7310 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Aug 2006 19:05:35 +0400 Subject: [PATCH] Fix a test suite failure. mysql-test/r/partition_grant.result: Update results (cleanup pon top of partition_grant.test) --- mysql-test/r/partition_grant.result | 2 ++ mysql-test/t/partition_grant.test | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/mysql-test/r/partition_grant.result b/mysql-test/r/partition_grant.result index da0e00c9858..e88427e5396 100644 --- a/mysql-test/r/partition_grant.result +++ b/mysql-test/r/partition_grant.result @@ -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 diff --git a/mysql-test/t/partition_grant.test b/mysql-test/t/partition_grant.test index e2e80a7ca04..ee7c71b497a 100644 --- a/mysql-test/t/partition_grant.test +++ b/mysql-test/t/partition_grant.test @@ -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);