summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/connect.result2
-rw-r--r--mysql-test/t/connect.test5
-rw-r--r--mysql-test/t/rpl_temporary.test4
3 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result
index a80ddc24d05..9c848c3434f 100644
--- a/mysql-test/r/connect.result
+++ b/mysql-test/r/connect.result
@@ -44,3 +44,5 @@ tables_priv
user
show tables;
Tables_in_test
+delete from mysql.user where user="test";
+flush privileges;
diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test
index 7b441ee5f7b..e6ccc52f0d4 100644
--- a/mysql-test/t/connect.test
+++ b/mysql-test/t/connect.test
@@ -62,3 +62,8 @@ show tables;
#--error 1045
#connect (con1,localhost,test,zorro,);
#--error 1045
+
+# remove user 'test' so that other tests which may use 'test'
+# do not depend on this test.
+delete from mysql.user where user="test";
+flush privileges;
diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test
index b50d9004f14..79dba60964d 100644
--- a/mysql-test/t/rpl_temporary.test
+++ b/mysql-test/t/rpl_temporary.test
@@ -19,9 +19,7 @@ connection master;
connect (con1,localhost,root,,);
connect (con2,localhost,root,,);
-# user 'boo' does not exist, because we want to be ''@localhost or ''@127.0.0.1
-# (using user 'test' conflicts with what connect.test does).
-connect (con3,localhost,boo,,);
+connect (con3,localhost,,,);
# We are going to use SET PSEUDO_THREAD_ID in this test;
# check that it requires the SUPER privilege.