summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorSneha Modi <sneha.modi@oracle.com>2013-08-21 15:24:38 +0530
committerSneha Modi <sneha.modi@oracle.com>2013-08-21 15:24:38 +0530
commit38ca6953375d2f87958d180195d5b6d866ab265f (patch)
tree07cfa26b2a65b87bc91aa4b25d0d41eb7b0bafaa /mysql-test/t
parent7697aac19d1648fff5cb21147836dffbbefc89f2 (diff)
downloadmariadb-git-38ca6953375d2f87958d180195d5b6d866ab265f.tar.gz
Bug#16995954 : PLUGIN_AUTH TESTS FAIL ON SYSTEMS WITH NO HOSTNAME OTHER
THAN LOCALHOST This is a test bug and the explanation for the behaviour can be found on the bug page.Modifying the select to select user where user!=root for the line where failure is encountered on machines with no hostname other than the localhost.
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/plugin_auth.test2
-rw-r--r--mysql-test/t/plugin_auth_qa_2.test8
2 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/plugin_auth.test b/mysql-test/t/plugin_auth.test
index 994b8f26308..dc9c39cf881 100644
--- a/mysql-test/t/plugin_auth.test
+++ b/mysql-test/t/plugin_auth.test
@@ -19,7 +19,7 @@ connect(plug_con,localhost,plug,plug_dest);
GRANT PROXY ON plug_dest TO plug;
--echo test proxies_priv columns
--replace_column 1 xx 7 xx
-SELECT * FROM mysql.proxies_priv;
+SELECT * FROM mysql.proxies_priv WHERE user !='root';
--echo test mysql.proxies_priv;
SHOW CREATE TABLE mysql.proxies_priv;
diff --git a/mysql-test/t/plugin_auth_qa_2.test b/mysql-test/t/plugin_auth_qa_2.test
index e265690dc7d..58c06688950 100644
--- a/mysql-test/t/plugin_auth_qa_2.test
+++ b/mysql-test/t/plugin_auth_qa_2.test
@@ -107,7 +107,7 @@ GRANT ALL PRIVILEGES ON test_user_db.* TO qa_test_6_dest identified by 'dest_pas
GRANT PROXY ON qa_test_6_dest TO qa_test_6_user;
--sorted_result
-SELECT user,plugin,authentication_string,password FROM mysql.user;
+SELECT user,plugin,authentication_string,password FROM mysql.user WHERE user != 'root';
--echo exec MYSQL PLUGIN_AUTH_OPT -h localhost -P MASTER_MYPORT --user=qa_test_6_user --password=qa_test_6_dest test_user_db -e "SELECT current_user(),user(),@@local.proxy_user,@@local.external_user;" 2>&1
--error 1
@@ -115,7 +115,7 @@ SELECT user,plugin,authentication_string,password FROM mysql.user;
GRANT PROXY ON qa_test_6_dest TO root IDENTIFIED WITH qa_auth_interface AS 'qa_test_6_dest';
--sorted_result
-SELECT user,plugin,authentication_string,password FROM mysql.user;
+SELECT user,plugin,authentication_string,password FROM mysql.user WHERE user != 'root';
--echo exec MYSQL PLUGIN_AUTH_OPT -h localhost -P MASTER_MYPORT --user=root --password=qa_test_6_dest test_user_db -e "SELECT current_user(),user(),@@local.proxy_user,@@local.external_user;" 2>&1
--error 1
@@ -123,7 +123,7 @@ SELECT user,plugin,authentication_string,password FROM mysql.user;
REVOKE PROXY ON qa_test_6_dest FROM root;
--sorted_result
-SELECT user,plugin,authentication_string FROM mysql.user;
+SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
--echo exec MYSQL PLUGIN_AUTH_OPT -h localhost -P MASTER_MYPORT --user=root --password=qa_test_6_dest test_user_db -e "SELECT current_user(),user(),@@local.proxy_user,@@local.external_user;" 2>&1
--error 1
@@ -133,7 +133,7 @@ DROP USER qa_test_6_user;
DROP USER qa_test_6_dest;
DELETE FROM mysql.user WHERE user='root' AND plugin='qa_auth_interface';
--sorted_result
-SELECT user,plugin,authentication_string,password FROM mysql.user;
+SELECT user,plugin,authentication_string,password FROM mysql.user WHERE user != 'root';
--echo === Test of the --default_auth option for clients ====