diff options
| author | unknown <anozdrin@mysql.com> | 2006-02-06 16:05:20 +0300 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-02-06 16:05:20 +0300 |
| commit | 642e222c4e23bc936886ecea353a5675838a4ead (patch) | |
| tree | 2388b03e0c777583ab0f8ec2babddf0c9891bd3b /mysql-test/r/trigger-grant.result | |
| parent | 18f4a81db2e60cc17f892072d06acee510917aaf (diff) | |
| download | mariadb-git-642e222c4e23bc936886ecea353a5675838a4ead.tar.gz | |
Fix merge (5.0 -> 5.1) of the patch for BUG#15166/15196.
mysql-test/r/trigger-grant.result:
Updated result file: use TRIGGER instead of SUPER for BUG#15166/15196 tests.
sql/item.cc:
Updated according to the 5.1 data structures.
Diffstat (limited to 'mysql-test/r/trigger-grant.result')
| -rw-r--r-- | mysql-test/r/trigger-grant.result | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mysql-test/r/trigger-grant.result b/mysql-test/r/trigger-grant.result index e50b6b46bb9..c3bbc82ef5b 100644 --- a/mysql-test/r/trigger-grant.result +++ b/mysql-test/r/trigger-grant.result @@ -195,18 +195,16 @@ CREATE TABLE t3(col CHAR(20)); CREATE TABLE t4(col CHAR(20)); 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; +GRANT TRIGGER ON mysqltest_db1.* TO mysqltest_u1@localhost; SET @mysqltest_var = NULL; ---> connection: default 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; Grants for mysqltest_u1@localhost -GRANT SUPER ON *.* TO 'mysqltest_u1'@'localhost' -GRANT DELETE ON `mysqltest_db1`.* TO 'mysqltest_u1'@'localhost' +GRANT USAGE ON *.* TO 'mysqltest_u1'@'localhost' +GRANT DELETE, TRIGGER ON `mysqltest_db1`.* TO 'mysqltest_u1'@'localhost' ---> connection: bug15166_u1_con use mysqltest_db1; |