Skip to content

Commit d83c73e

Browse files
gkodinovgkodinov
committed
merge
2 parents f6b53c1 + 52edb4a commit d83c73e

16 files changed

+205
-95
lines changed

‎mysql-test/r/grant.result

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ max_updates 0
5454
max_connections 0
5555
max_user_connections 0
5656
plugin
57-
authentication_string
57+
authentication_string NULL
5858
show grants for mysqltest_1@localhost;
5959
Grants for mysqltest_1@localhost
6060
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' REQUIRE CIPHER 'EDH-RSA-DES-CBC3-SHA'
@@ -125,7 +125,7 @@ max_updates 0
125125
max_connections 0
126126
max_user_connections 0
127127
plugin
128-
authentication_string
128+
authentication_string NULL
129129
show grants for mysqltest_1@localhost;
130130
Grants for mysqltest_1@localhost
131131
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' WITH MAX_QUERIES_PER_HOUR 10
@@ -172,7 +172,7 @@ max_updates 20
172172
max_connections 30
173173
max_user_connections 0
174174
plugin
175-
authentication_string
175+
authentication_string NULL
176176
show grants for mysqltest_1@localhost;
177177
Grants for mysqltest_1@localhost
178178
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' WITH MAX_QUERIES_PER_HOUR 10 MAX_UPDATES_PER_HOUR 20 MAX_CONNECTIONS_PER_HOUR 30
@@ -284,7 +284,6 @@ Warnings:
284284
Warning 1364 Field 'ssl_cipher' doesn't have a default value
285285
Warning 1364 Field 'x509_issuer' doesn't have a default value
286286
Warning 1364 Field 'x509_subject' doesn't have a default value
287-
Warning 1364 Field 'authentication_string' doesn't have a default value
288287
insert into mysql.db (host, db, user, select_priv) values
289288
('localhost', 'a%', 'test11', 'Y'), ('localhost', 'ab%', 'test11', 'Y');
290289
alter table mysql.db order by db asc;

‎mysql-test/r/grant2.result

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ Warnings:
287287
Warning 1364 Field 'ssl_cipher' doesn't have a default value
288288
Warning 1364 Field 'x509_issuer' doesn't have a default value
289289
Warning 1364 Field 'x509_subject' doesn't have a default value
290-
Warning 1364 Field 'authentication_string' doesn't have a default value
291290
create user mysqltest_A@'%';
292291
rename user mysqltest_B@'%' to mysqltest_C@'%';
293292
drop user mysqltest_C@'%';
@@ -355,7 +354,6 @@ Warnings:
355354
Warning 1364 Field 'ssl_cipher' doesn't have a default value
356355
Warning 1364 Field 'x509_issuer' doesn't have a default value
357356
Warning 1364 Field 'x509_subject' doesn't have a default value
358-
Warning 1364 Field 'authentication_string' doesn't have a default value
359357
INSERT INTO mysql.db (host, db, user, select_priv) VALUES
360358
('%','TESTDB','mysqltest_1','Y');
361359
FLUSH PRIVILEGES;

‎mysql-test/r/plugin_auth.result

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,4 +345,62 @@ select USER(),CURRENT_USER();
345345
USER() CURRENT_USER()
346346
uplain@localhost uplain@localhost
347347
DROP USER uplain@localhost;
348+
#
349+
# Bug #59038 : mysql.user.authentication_string column
350+
# causes configuration wizard to fail
351+
INSERT INTO mysql.user(
352+
Host,
353+
User,
354+
Password,
355+
Select_priv,
356+
Insert_priv,
357+
Update_priv,
358+
Delete_priv,
359+
Create_priv,
360+
Drop_priv,
361+
Reload_priv,
362+
Shutdown_priv,
363+
Process_priv,
364+
File_priv,
365+
Grant_priv,
366+
References_priv,
367+
Index_priv,
368+
Alter_priv,
369+
Show_db_priv,
370+
Super_priv,
371+
Create_tmp_table_priv,
372+
Lock_tables_priv,
373+
Execute_priv,
374+
Repl_slave_priv,
375+
Repl_client_priv,
376+
/*!50001
377+
Create_view_priv,
378+
Show_view_priv,
379+
Create_routine_priv,
380+
Alter_routine_priv,
381+
Create_user_priv,
382+
*/
383+
ssl_type,
384+
ssl_cipher,
385+
x509_issuer,
386+
x509_subject,
387+
max_questions,
388+
max_updates,
389+
max_connections)
390+
VALUES (
391+
'localhost',
392+
'inserttest', '',
393+
'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y',
394+
'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y',
395+
/*!50001 'Y', 'Y', 'Y', 'Y', 'Y', */'', '', '', '', '0', '0', '0');
396+
FLUSH PRIVILEGES;
397+
DROP USER inserttest@localhost;
398+
SELECT IS_NULLABLE, COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE
399+
COLUMN_NAME IN ('authentication_string', 'plugin') AND
400+
TABLE_NAME='user' AND
401+
TABLE_SCHEMA='mysql'
402+
ORDER BY COLUMN_NAME;
403+
IS_NULLABLE COLUMN_NAME
404+
YES authentication_string
405+
YES plugin
348406
End of 5.5 tests

‎mysql-test/r/plugin_auth_qa.result

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ CREATE USER plug_dest IDENTIFIED BY 'plug_dest_passwd';
105105
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
106106
user plugin authentication_string
107107
plug test_plugin_server plug_dest
108-
plug_dest
108+
plug_dest NULL
109109
DROP USER plug, plug_dest;
110110
CREATE USER plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
111111
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
@@ -115,7 +115,7 @@ DROP USER plug;
115115
CREATE USER plug_dest IDENTIFIED BY 'plug_dest_passwd';
116116
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
117117
user plugin authentication_string
118-
plug_dest
118+
plug_dest NULL
119119
DROP USER plug_dest;
120120
GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
121121
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
@@ -125,7 +125,7 @@ CREATE USER plug_dest IDENTIFIED BY 'plug_dest_passwd';
125125
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
126126
user plugin authentication_string
127127
plug test_plugin_server plug_dest
128-
plug_dest
128+
plug_dest NULL
129129
DROP USER plug, plug_dest;
130130
GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH test_plugin_server AS 'plug_dest';
131131
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
@@ -135,7 +135,7 @@ DROP USER plug;
135135
CREATE USER plug_dest IDENTIFIED BY 'plug_dest_passwd';
136136
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
137137
user plugin authentication_string
138-
plug_dest
138+
plug_dest NULL
139139
DROP USER plug_dest;
140140
CREATE USER plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
141141
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
@@ -145,7 +145,7 @@ GRANT ALL PRIVILEGES ON test_user_db.* TO plug_dest IDENTIFIED BY 'plug_dest_pas
145145
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
146146
user plugin authentication_string
147147
plug test_plugin_server plug_dest
148-
plug_dest
148+
plug_dest NULL
149149
DROP USER plug, plug_dest;
150150
CREATE USER plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
151151
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
@@ -155,7 +155,7 @@ DROP USER plug;
155155
GRANT ALL PRIVILEGES ON test_user_db.* TO plug_dest IDENTIFIED BY 'plug_dest_passwd';
156156
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
157157
user plugin authentication_string
158-
plug_dest
158+
plug_dest NULL
159159
DROP USER plug_dest;
160160
CREATE USER plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
161161
GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
@@ -210,7 +210,7 @@ DROP USER plüg;
210210
CREATE USER plüg_dest IDENTIFIED BY 'plug_dest_passwd';
211211
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
212212
user plugin authentication_string
213-
plüg_dest
213+
plüg_dest NULL
214214
DROP USER plüg_dest;
215215
SET NAMES ascii;
216216
CREATE USER 'plüg' IDENTIFIED WITH 'test_plugin_server' AS 'plüg_dest';
@@ -221,7 +221,7 @@ DROP USER 'plüg';
221221
CREATE USER 'plüg_dest' IDENTIFIED BY 'plug_dest_passwd';
222222
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
223223
user plugin authentication_string
224-
pl??g_dest
224+
pl??g_dest NULL
225225
DROP USER 'plüg_dest';
226226
SET NAMES latin1;
227227
========== test 1.1.1.5 ====================================
@@ -235,7 +235,7 @@ DROP USER 'plug';
235235
CREATE USER 'plüg_dest' IDENTIFIED BY 'plug_dest_passwd';
236236
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
237237
user plugin authentication_string
238-
plüg_dest
238+
plüg_dest NULL
239239
DROP USER 'plüg_dest';
240240
SET NAMES utf8;
241241
CREATE USER plüg IDENTIFIED WITH 'test_plügin_server' AS 'plüg_dest';
@@ -248,7 +248,7 @@ DROP USER 'plüg';
248248
CREATE USER 'plüg_dest' IDENTIFIED BY 'plug_dest_passwd';
249249
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
250250
user plugin authentication_string
251-
plüg_dest
251+
plüg_dest NULL
252252
DROP USER 'plüg_dest';
253253
CREATE USER plüg IDENTIFIED WITH test_plugin_server AS 'plüg_dest';
254254
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
@@ -258,7 +258,7 @@ DROP USER plüg;
258258
CREATE USER plüg_dest IDENTIFIED BY 'plug_dest_passwd';
259259
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
260260
user plugin authentication_string
261-
plüg_dest
261+
plüg_dest NULL
262262
DROP USER plüg_dest;
263263
========== test 1.1.1.2/1.1.2.2=============================
264264
SET @auth_name= 'test_plugin_server';
@@ -278,7 +278,7 @@ DROP USER plug;
278278
CREATE USER 'hh''s_plug_dest' IDENTIFIED BY 'plug_dest_passwd';
279279
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
280280
user plugin authentication_string
281-
hh's_plug_dest
281+
hh's_plug_dest NULL
282282
DROP USER 'hh''s_plug_dest';
283283
========== test 1.1.1.4 ====================================
284284
CREATE USER plug IDENTIFIED WITH hh''s_test_plugin_server AS 'plug_dest';
@@ -294,7 +294,7 @@ GRANT ALL PRIVILEGES ON test_user_db.* TO plug_dest;
294294
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
295295
user plugin authentication_string
296296
grant_user test_plugin_server plug_dest
297-
plug_dest
297+
plug_dest NULL
298298
DROP USER grant_user,plug_dest;
299299
set @save_sql_mode= @@sql_mode;
300300
SET @@sql_mode=no_auto_create_user;
@@ -315,13 +315,13 @@ CREATE USER plug_dest IDENTIFIED BY 'plug_dest_passwd';
315315
SELECT user,plugin,authentication_string,password FROM mysql.user WHERE user != 'root';
316316
user plugin authentication_string password
317317
grant_user test_plugin_server plug_dest
318-
plug_dest *939AEE68989794C0F408277411C26055CDF41119
318+
plug_dest NULL *939AEE68989794C0F408277411C26055CDF41119
319319
DROP USER plug_dest;
320320
GRANT ALL PRIVILEGES ON test_user_db.* TO plug_dest IDENTIFIED BY 'plug_user_passwd';
321321
SELECT user,plugin,authentication_string,password FROM mysql.user WHERE user != 'root';
322322
user plugin authentication_string password
323323
grant_user test_plugin_server plug_dest
324-
plug_dest *560881EB651416CEF77314D07D55EDCD5FC1BD6D
324+
plug_dest NULL *560881EB651416CEF77314D07D55EDCD5FC1BD6D
325325
DROP USER grant_user,plug_dest;
326326
set @@sql_mode= @save_sql_mode;
327327
DROP DATABASE test_user_db;

‎mysql-test/r/plugin_auth_qa_1.result

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ GRANT ALL PRIVILEGES ON test_user_db.* TO plug_dest IDENTIFIED BY 'plug_dest_pas
2121
GRANT PROXY ON plug_dest TO plug_user;
2222
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
2323
user plugin authentication_string
24-
plug_dest
24+
plug_dest NULL
2525
plug_user test_plugin_server plug_dest
2626
1)
2727
current_user()
@@ -74,7 +74,7 @@ GRANT PROXY ON new_dest TO plug_user;
7474
ERROR 1045 (28000): Access denied for user 'plug_user'@'localhost' (using password: YES)
7575
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
7676
user plugin authentication_string
77-
new_dest
77+
new_dest NULL
7878
plug_user test_plugin_server plug_dest
7979
DROP USER plug_user,new_dest;
8080
CREATE USER plug_user
@@ -92,7 +92,7 @@ GRANT PROXY ON new_dest TO plug_user;
9292
ERROR 1045 (28000): Access denied for user 'plug_user'@'localhost' (using password: YES)
9393
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
9494
user plugin authentication_string
95-
new_dest
95+
new_dest NULL
9696
plug_user test_plugin_server plug_dest
9797
DROP USER plug_user,new_dest;
9898
CREATE USER plug_user
@@ -114,13 +114,13 @@ connection default;
114114
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
115115
user plugin authentication_string
116116
new_user test_plugin_server plug_dest
117-
plug_dest
117+
plug_dest NULL
118118
disconnect plug_user;
119119
UPDATE mysql.user SET user='plug_user' WHERE user='new_user';
120120
FLUSH PRIVILEGES;
121121
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
122122
user plugin authentication_string
123-
plug_dest
123+
plug_dest NULL
124124
plug_user test_plugin_server plug_dest
125125
DROP USER plug_dest,plug_user;
126126
========== test 1.3 ========================================
@@ -136,26 +136,26 @@ connection default;
136136
disconnect plug_user;
137137
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
138138
user plugin authentication_string
139-
plug_dest
139+
plug_dest NULL
140140
plug_user test_plugin_server plug_dest
141141
UPDATE mysql.user SET user='new_user' WHERE user='plug_user';
142142
FLUSH PRIVILEGES;
143143
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
144144
user plugin authentication_string
145145
new_user test_plugin_server plug_dest
146-
plug_dest
146+
plug_dest NULL
147147
UPDATE mysql.user SET authentication_string='new_dest' WHERE user='new_user';
148148
FLUSH PRIVILEGES;
149149
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
150150
user plugin authentication_string
151151
new_user test_plugin_server new_dest
152-
plug_dest
152+
plug_dest NULL
153153
UPDATE mysql.user SET plugin='new_plugin_server' WHERE user='new_user';
154154
FLUSH PRIVILEGES;
155155
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
156156
user plugin authentication_string
157157
new_user new_plugin_server new_dest
158-
plug_dest
158+
plug_dest NULL
159159
connect(plug_user,localhost,new_user,new_dest);
160160
ERROR HY000: Plugin 'new_plugin_server' is not loaded
161161
UPDATE mysql.user SET plugin='test_plugin_server' WHERE user='new_user';
@@ -164,7 +164,7 @@ FLUSH PRIVILEGES;
164164
GRANT PROXY ON new_dest TO new_user;
165165
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
166166
user plugin authentication_string
167-
new_dest
167+
new_dest NULL
168168
new_user test_plugin_server new_dest
169169
connect(plug_user,localhost,new_user,new_dest);
170170
select USER(),CURRENT_USER();
@@ -177,9 +177,9 @@ FLUSH PRIVILEGES;
177177
CREATE USER new_dest IDENTIFIED BY 'new_dest_passwd';
178178
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
179179
user plugin authentication_string
180-
new_dest
180+
new_dest NULL
181181
new_user test_plugin_server new_dest
182-
plug_dest
182+
plug_dest NULL
183183
GRANT ALL PRIVILEGES ON test.* TO new_user;
184184
connect(plug_user,localhost,new_dest,new_dest_passwd);
185185
select USER(),CURRENT_USER();
@@ -194,7 +194,7 @@ CREATE USER proxied_user IDENTIFIED BY 'proxied_user_passwd';
194194
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
195195
user plugin authentication_string
196196
test_plugin_server proxied_user
197-
proxied_user
197+
proxied_user NULL
198198
connect(proxy_con,localhost,proxied_user,proxied_user_passwd);
199199
SELECT USER(),CURRENT_USER();
200200
USER() CURRENT_USER()
@@ -231,7 +231,7 @@ CREATE USER proxied_user IDENTIFIED BY 'proxied_user_passwd';
231231
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
232232
user plugin authentication_string
233233
test_plugin_server proxied_user
234-
proxied_user
234+
proxied_user NULL
235235
connect(proxy_con,localhost,proxied_user,proxied_user_passwd);
236236
SELECT USER(),CURRENT_USER();
237237
USER() CURRENT_USER()
@@ -274,11 +274,11 @@ GRANT PROXY ON proxied_user_5 TO ''@'';
274274
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
275275
user plugin authentication_string
276276
test_plugin_server proxied_user
277-
proxied_user_1
278-
proxied_user_2
279-
proxied_user_3
280-
proxied_user_4
281-
proxied_user_5
277+
proxied_user_1 NULL
278+
proxied_user_2 NULL
279+
proxied_user_3 NULL
280+
proxied_user_4 NULL
281+
proxied_user_5 NULL
282282
connect(proxy_con_1,localhost,proxied_user_1,'proxied_user_1_pwd');
283283
connect(proxy_con_2,localhost,proxied_user_2,proxied_user_2_pwd);
284284
connect(proxy_con_3,localhost,proxied_user_3,proxied_user_3_pwd);

0 commit comments

Comments
 (0)