summaryrefslogtreecommitdiff
path: root/mysql-test/t/plugin_auth.test
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2010-11-05 15:24:16 +0100
committerJon Olav Hauglid <jon.hauglid@oracle.com>2010-11-05 15:24:16 +0100
commit0de0d997f0ec877c17fe55bd59d6f2098c021a7f (patch)
tree8c8c1c761437a638ec0de31bfbf1b3c5fe699e41 /mysql-test/t/plugin_auth.test
parentb138f1d77dcf85c693eec4332eb7556ecf151016 (diff)
parentda6683d3a390a4f2ce823270a81c1e497d597c30 (diff)
downloadmariadb-git-0de0d997f0ec877c17fe55bd59d6f2098c021a7f.tar.gz
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'mysql-test/t/plugin_auth.test')
-rw-r--r--mysql-test/t/plugin_auth.test7
1 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/t/plugin_auth.test b/mysql-test/t/plugin_auth.test
index 77dcd7add73..439cabaef18 100644
--- a/mysql-test/t/plugin_auth.test
+++ b/mysql-test/t/plugin_auth.test
@@ -16,6 +16,11 @@ connect(plug_con,localhost,plug,plug_dest);
--enable_query_log
GRANT PROXY ON plug_dest TO plug;
+--echo test proxies_priv columns
+--replace_column 1 xx 7 xx
+SELECT * FROM mysql.proxies_priv;
+--echo test mysql.proxies_priv;
+SHOW CREATE TABLE mysql.proxies_priv;
connect(plug_con,localhost,plug,plug_dest);
@@ -226,7 +231,7 @@ CREATE USER test_drop@localhost;
GRANT PROXY ON future_user TO test_drop@localhost;
SHOW GRANTS FOR test_drop@localhost;
DROP USER test_drop@localhost;
-SELECT * FROM mysql.proxy_priv WHERE Host = 'test_drop' AND User = 'localhost';
+SELECT * FROM mysql.proxies_priv WHERE Host = 'test_drop' AND User = 'localhost';
DROP USER proxy_admin;