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

2 files changed, 0 insertions, 6 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%';
diff --git a/mysql-test/t/read_only.test b/mysql-test/t/read_only.test
index dfebe48a73c..fd41a3225a6 100644
--- a/mysql-test/t/read_only.test
+++ b/mysql-test/t/read_only.test
@@ -246,7 +246,6 @@ grant all on mysqltest_db1.* to `mysqltest_u1`@`%`;
 flush privileges;
 connect (con_bug27440,127.0.0.1,mysqltest_u1,,test,$MASTER_MYPORT,);
 connection con_bug27440;
-show grants for current_user();
 --error ER_OPTION_PREVENTS_STATEMENT
 create database mysqltest_db2;
 show databases like '%mysqltest_db2%';