1 |
commit: 845f78800450b3590a12c085444183918ff48efd |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 13 21:12:11 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 13 21:12:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=845f7880 |
7 |
|
8 |
Add 20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch |
9 |
|
10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
11 |
|
12 |
...l_mysql-5.7.23-fix-grant_user_lock-a-root.patch | 85 ++++++++++++++++++++++ |
13 |
1 file changed, 85 insertions(+) |
14 |
|
15 |
diff --git a/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch b/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch |
16 |
new file mode 100644 |
17 |
index 0000000..aecc6a5 |
18 |
--- /dev/null |
19 |
+++ b/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch |
20 |
@@ -0,0 +1,85 @@ |
21 |
+Description: Fixes test failing when run as root |
22 |
+ Certain tests will fail when run as root. This patch fixes one, |
23 |
+ main.grant_user_lock, which tries to test an anonymous user in |
24 |
+ a way that fails when running as root. The patch fixes only |
25 |
+ this test because there have been issues in Debian with only |
26 |
+ this test failing in this way. |
27 |
+Author: Lars Tangvald <lars.tangvald@××××××.com> |
28 |
+Bug-Debian: https://bugs.debian.org/841592 |
29 |
+Bug: http://bugs.mysql.com/bug.php?id=83751 |
30 |
+Last-Update: 2016-11-09 |
31 |
+ |
32 |
+--- mysql-5.7-5.7.16.orig/mysql-test/r/grant_user_lock.result |
33 |
++++ mysql-5.7-5.7.16/mysql-test/r/grant_user_lock.result |
34 |
+@@ -98,13 +98,13 @@ CURRENT_USER() |
35 |
+ DROP USER ''@localhost; |
36 |
+ # Create anonymous user - LOCK |
37 |
+ CREATE USER ''@localhost IDENTIFIED BY 'pass' ACCOUNT LOCK; |
38 |
+-connect(localhost,,pass,test,MASTER_PORT,MASTER_SOCKET); |
39 |
++connect(localhost, ,pass,test,MASTER_PORT,MASTER_SOCKET); |
40 |
+ ERROR HY000: Access denied for user '(null)'@'localhost'. Account is locked. |
41 |
+ DROP USER ''@localhost; |
42 |
+ # Disabling anonymous user |
43 |
+ CREATE USER ''@localhost IDENTIFIED BY 'pass'; |
44 |
+ ALTER USER ''@localhost ACCOUNT LOCK; |
45 |
+-connect(localhost,,pass,test,MASTER_PORT,MASTER_SOCKET); |
46 |
++connect(localhost, ,pass,test,MASTER_PORT,MASTER_SOCKET); |
47 |
+ ERROR HY000: Access denied for user '(null)'@'localhost'. Account is locked. |
48 |
+ DROP USER ''@localhost; |
49 |
+ # Enabling anonymous user |
50 |
+--- mysql-5.7-5.7.16.orig/mysql-test/t/grant_user_lock.test |
51 |
++++ mysql-5.7-5.7.16/mysql-test/t/grant_user_lock.test |
52 |
+@@ -113,7 +113,7 @@ DROP USER unlocked_user2@localhost; |
53 |
+ --echo # Create anonymous user |
54 |
+ connection default; |
55 |
+ CREATE USER ''@localhost IDENTIFIED BY 'pass'; |
56 |
+-connect(anonymous_user_con, localhost, '', pass); |
57 |
++connect(anonymous_user_con, localhost, ' ', pass); |
58 |
+ SELECT CURRENT_USER(); |
59 |
+ disconnect anonymous_user_con; |
60 |
+ connection default; |
61 |
+@@ -122,7 +122,7 @@ DROP USER ''@localhost; |
62 |
+ --echo # Create anonymous user - explicit UNLOCK |
63 |
+ connection default; |
64 |
+ CREATE USER ''@localhost IDENTIFIED BY 'pass' ACCOUNT UNLOCK; |
65 |
+-connect(anonymous_user_con, localhost, '', pass); |
66 |
++connect(anonymous_user_con, localhost, ' ', pass); |
67 |
+ SELECT CURRENT_USER(); |
68 |
+ disconnect anonymous_user_con; |
69 |
+ connection default; |
70 |
+@@ -133,7 +133,7 @@ connection default; |
71 |
+ CREATE USER ''@localhost IDENTIFIED BY 'pass' ACCOUNT LOCK; |
72 |
+ --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT |
73 |
+ --error ER_ACCOUNT_HAS_BEEN_LOCKED |
74 |
+-connect(anonymous_user_con, localhost, '', pass); |
75 |
++connect(anonymous_user_con, localhost, ' ', pass); |
76 |
+ connection default; |
77 |
+ DROP USER ''@localhost; |
78 |
+ |
79 |
+@@ -143,7 +143,7 @@ CREATE USER ''@localhost IDENTIFIED BY ' |
80 |
+ ALTER USER ''@localhost ACCOUNT LOCK; |
81 |
+ --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT |
82 |
+ --error ER_ACCOUNT_HAS_BEEN_LOCKED |
83 |
+-connect(anonymous_user_con, localhost, '', pass); |
84 |
++connect(anonymous_user_con, localhost, ' ', pass); |
85 |
+ connection default; |
86 |
+ DROP USER ''@localhost; |
87 |
+ |
88 |
+@@ -151,7 +151,7 @@ DROP USER ''@localhost; |
89 |
+ connection default; |
90 |
+ CREATE USER ''@localhost IDENTIFIED BY 'pass' ACCOUNT LOCK; |
91 |
+ ALTER USER ''@localhost ACCOUNT UNLOCK; |
92 |
+-connect(anonymous_user_con, localhost, '', pass); |
93 |
++connect(anonymous_user_con, localhost, ' ', pass); |
94 |
+ SELECT CURRENT_USER(); |
95 |
+ disconnect anonymous_user_con; |
96 |
+ connection default; |
97 |
+@@ -171,7 +171,7 @@ connection default; |
98 |
+ CREATE user ''@localhost IDENTIFIED BY 'pass'; |
99 |
+ CREATE USER 'unlocked_user'@localhost IDENTIFIED BY 'pass'; |
100 |
+ |
101 |
+-connect(anonymous_user_con, localhost, '', pass); |
102 |
++connect(anonymous_user_con, localhost, ' ', pass); |
103 |
+ --error ER_TABLEACCESS_DENIED_ERROR |
104 |
+ UPDATE mysql.user SET account_locked='Y' |
105 |
+ WHERE user='unlocked_user' and host = 'localhost'; |