summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorHorst.Hunger <horst.hunger@sun.com>2009-11-27 09:02:32 +0100
committerHorst.Hunger <horst.hunger@sun.com>2009-11-27 09:02:32 +0100
commit66cd54d923c91e13f2cecd10e36928dc3be7b5a4 (patch)
tree14aea45b51a52b9f0535e21b9f916337e5c48acb /mysql-test/r
parent9b9abc50a78e5513e3e944bb515aaec6a9a4ddb5 (diff)
downloadmariadb-git-66cd54d923c91e13f2cecd10e36928dc3be7b5a4.tar.gz
No more socket and no more diffs in result files.
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/ipv4_as_ipv6_win.result2
-rw-r--r--mysql-test/r/ipv6_win.result18
2 files changed, 11 insertions, 9 deletions
diff --git a/mysql-test/r/ipv4_as_ipv6_win.result b/mysql-test/r/ipv4_as_ipv6_win.result
index 4ef7062055e..4a8a1eef001 100644
--- a/mysql-test/r/ipv4_as_ipv6_win.result
+++ b/mysql-test/r/ipv4_as_ipv6_win.result
@@ -29,3 +29,5 @@ root@localhost
DROP USER testuser1@'127.0.0.1';
=============Test of '::1' ========================
connect (con1, ::1, root, , test, MASTER_MYPORT,);
+Got one of the listed errors
+
diff --git a/mysql-test/r/ipv6_win.result b/mysql-test/r/ipv6_win.result
index 1ff51fcc831..8082e8aa25e 100644
--- a/mysql-test/r/ipv6_win.result
+++ b/mysql-test/r/ipv6_win.result
@@ -15,17 +15,17 @@ inet_ntoa(@nip)
NULL
SELECT USER();
USER()
-root@localhost
+root@::1
SELECT current_user();
current_user()
-root@localhost
+root@::1
SHOW PROCESSLIST;
REVOKE ALL ON test.* FROM testuser@'::1';
RENAME USER testuser@'::1' to testuser1@'::1';
SET PASSWORD FOR testuser1@'::1' = PASSWORD ('9876');
SELECT USER();
USER()
-root@localhost
+root@::1
DROP USER testuser1@'::1';
=============Test of '::1/128' ====================================
=============Test of '0000:0000:0000:0000:0000:0000:0000:0001' ====
@@ -45,17 +45,17 @@ inet_ntoa(@nip)
NULL
SELECT USER();
USER()
-root@localhost
+root@::1
SELECT current_user();
current_user()
-root@localhost
+root@::1
SHOW PROCESSLIST;
REVOKE ALL ON test.* FROM testuser@'0000:0000:0000:0000:0000:0000:0000:0001';
RENAME USER testuser@'0000:0000:0000:0000:0000:0000:0000:0001' to testuser1@'0000:0000:0000:0000:0000:0000:0000:0001';
SET PASSWORD FOR testuser1@'0000:0000:0000:0000:0000:0000:0000:0001' = PASSWORD ('9876');
SELECT USER();
USER()
-root@localhost
+root@::1
DROP USER testuser1@'0000:0000:0000:0000:0000:0000:0000:0001';
=============Test of '0:0:0:0:0:0:0:1' ============================
mysqld is alive
@@ -74,15 +74,15 @@ inet_ntoa(@nip)
NULL
SELECT USER();
USER()
-root@localhost
+root@::1
SELECT current_user();
current_user()
-root@localhost
+root@::1
SHOW PROCESSLIST;
REVOKE ALL ON test.* FROM testuser@'0:0:0:0:0:0:0:1';
RENAME USER testuser@'0:0:0:0:0:0:0:1' to testuser1@'0:0:0:0:0:0:0:1';
SET PASSWORD FOR testuser1@'0:0:0:0:0:0:0:1' = PASSWORD ('9876');
SELECT USER();
USER()
-root@localhost
+root@::1
DROP USER testuser1@'0:0:0:0:0:0:0:1';