summaryrefslogtreecommitdiff
path: root/mysql-test/r/grant2.result
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-28 10:55:44 +0300
committerAlexander Nozdrin <alik@sun.com>2009-10-28 10:55:44 +0300
commit22fe8e10e297c40bc88104fb6a13e5183238850e (patch)
tree76a0977cebe3775f61ae3281cc608601eb883243 /mysql-test/r/grant2.result
parenta4068d17fdf56ee79e4d538d47799ca0eeb67de3 (diff)
parentcd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff)
downloadmariadb-git-22fe8e10e297c40bc88104fb6a13e5183238850e.tar.gz
Merge from mysql-next-mr.
Diffstat (limited to 'mysql-test/r/grant2.result')
-rw-r--r--mysql-test/r/grant2.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result
index 1f69ab6c2cf..eae12491a4d 100644
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/r/grant2.result
@@ -121,9 +121,9 @@ mysqltest_5@host5, mysqltest_6@host6, mysqltest_7@host7;
create database mysqltest_1;
grant select, insert, update on `mysqltest\_1`.* to mysqltest_1@localhost;
set sql_log_off = 1;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
set sql_log_bin = 0;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
delete from mysql.user where user like 'mysqltest\_1';
delete from mysql.db where user like 'mysqltest\_1';
drop database mysqltest_1;