summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-03-13 18:32:42 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-03-13 18:32:42 -0300
commit4c205a65fb9761a4e667ba157730432ef26c9ea9 (patch)
treeca5a9b4a4f1acaaaffdb8128c186f28ba149cc58
parent81ffd72a5821f07129dedf4c31c3cbc2abfac372 (diff)
downloadmariadb-git-4c205a65fb9761a4e667ba157730432ef26c9ea9.tar.gz
Post-merge fix: remove unnecessary flush privileges.
-rw-r--r--mysql-test/r/plugin_not_embedded.result1
-rw-r--r--mysql-test/t/plugin_not_embedded.test1
2 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/plugin_not_embedded.result b/mysql-test/r/plugin_not_embedded.result
index ca6b1e5b1f4..82cfe7b23b8 100644
--- a/mysql-test/r/plugin_not_embedded.result
+++ b/mysql-test/r/plugin_not_embedded.result
@@ -6,6 +6,5 @@ INSTALL PLUGIN example SONAME 'ha_example.so';
UNINSTALL PLUGIN example;
ERROR 42000: DELETE command denied to user 'bug51770'@'localhost' for table 'plugin'
GRANT DELETE ON mysql.plugin TO bug51770@localhost;
-FLUSH PRIVILEGES;
UNINSTALL PLUGIN example;
DROP USER bug51770@localhost;
diff --git a/mysql-test/t/plugin_not_embedded.test b/mysql-test/t/plugin_not_embedded.test
index eea7deab40c..339d28fb236 100644
--- a/mysql-test/t/plugin_not_embedded.test
+++ b/mysql-test/t/plugin_not_embedded.test
@@ -12,7 +12,6 @@ eval INSTALL PLUGIN example SONAME $HA_EXAMPLE_SO;
UNINSTALL PLUGIN example;
connection default;
GRANT DELETE ON mysql.plugin TO bug51770@localhost;
-FLUSH PRIVILEGES;
connection con1;
UNINSTALL PLUGIN example;
disconnect con1;