summaryrefslogtreecommitdiff
path: root/mysql-test/r/read_only.result
diff options
context:
space:
mode:
authorunknown <thek@adventure.(none)>2007-12-10 16:47:45 +0100
committerunknown <thek@adventure.(none)>2007-12-10 16:47:45 +0100
commitede6f50a6a92aef2bf1105d4da98796ca309c3bd (patch)
treecb84a9b3a72937c9eea357ecf31cfc36a334716f /mysql-test/r/read_only.result
parentd0e99dfa26f563a9a82996fe9e039ec783aa14f0 (diff)
parentdcc2e663916925c152c14599751ab107e0ae7999 (diff)
downloadmariadb-git-ede6f50a6a92aef2bf1105d4da98796ca309c3bd.tar.gz
Merge adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime mysql-test/r/read_only.result: Auto merged sql/sql_parse.cc: Auto merged mysql-test/t/read_only.test: Manual merge
Diffstat (limited to 'mysql-test/r/read_only.result')
-rw-r--r--mysql-test/r/read_only.result5
1 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/r/read_only.result b/mysql-test/r/read_only.result
index 683f54a3be4..cf81566f4e5 100644
--- a/mysql-test/r/read_only.result
+++ b/mysql-test/r/read_only.result
@@ -112,11 +112,6 @@ grant all on mysqltest_db2.* to `mysqltest_u1`@`%`;
create database mysqltest_db1;
grant all on mysqltest_db1.* to `mysqltest_u1`@`%`;
flush privileges;
-show grants for current_user();
-Grants for mysqltest_u1@%
-GRANT USAGE ON *.* TO 'mysqltest_u1'@'%'
-GRANT ALL PRIVILEGES ON `mysqltest_db2`.* TO 'mysqltest_u1'@'%'
-GRANT ALL PRIVILEGES ON `mysqltest_db1`.* TO 'mysqltest_u1'@'%'
create database mysqltest_db2;
ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
show databases like '%mysqltest_db2%';