Skip to content

Commit a3099a3

Browse files
sanja-byelkinsanja-byelkin
committed
MDEV-24312 master_host has 60 character limit, increase to 255 bytes
Also increase user name up to 128. The work was started by Rucha Deodhar <rucha.deodhar@mariadb.com>, contains audit plugin fixes by Alexey Botchkov <holyfoot@askmonty.org>.
1 parent 8751aa7 commit a3099a3

File tree

80 files changed

+929
-524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+929
-524
lines changed

‎include/mysql_com.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "my_decimal_limits.h"
2525

26-
#define HOSTNAME_LENGTH 60
26+
#define HOSTNAME_LENGTH 255
2727
#define HOSTNAME_LENGTH_STR STRINGIFY_ARG(HOSTNAME_LENGTH)
2828
#define SYSTEM_CHARSET_MBMAXLEN 3
2929
#define NAME_CHAR_LEN 64 /* Field/table name length */

‎mysql-test/main/connect.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,12 +324,12 @@ Connection on extra port 2 ok
324324
# -- Bug#49752: 2469.126.2 unintentionally breaks authentication
325325
# against MySQL 5.1 server
326326
#
327-
GRANT ALL ON test.* TO 'O1234567890123456789012345678901234567890123456789012345678901234567890123456789'@'localhost' IDENTIFIED BY 'test123';
327+
GRANT ALL ON test.* TO 'O1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567'@'localhost' IDENTIFIED BY 'test123';
328328
FLUSH PRIVILEGES;
329-
connect con1,localhost,O1234567890123456789012345678901234567890123456789012345678901234567890123456789x,test123,test;
329+
connect con1,localhost, O1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567x,test123,test;
330330
disconnect con1;
331331
connection default;
332-
DROP USER 'O1234567890123456789012345678901234567890123456789012345678901234567890123456789'@'localhost';
332+
DROP USER 'O1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567'@'localhost';
333333
FLUSH PRIVILEGES;
334334
#
335335
# -- End of Bug#49752

‎mysql-test/main/connect.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,16 +339,16 @@ if ($error)
339339
--echo # against MySQL 5.1 server
340340
--echo #
341341

342-
GRANT ALL ON test.* TO 'O1234567890123456789012345678901234567890123456789012345678901234567890123456789'@'localhost' IDENTIFIED BY 'test123';
342+
GRANT ALL ON test.* TO 'O1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567'@'localhost' IDENTIFIED BY 'test123';
343343

344344
FLUSH PRIVILEGES;
345345

346-
connect (con1,localhost,O1234567890123456789012345678901234567890123456789012345678901234567890123456789x,test123,test);
346+
connect (con1,localhost, O1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567x,test123,test);
347347
disconnect con1;
348348

349349
connection default;
350350

351-
DROP USER 'O1234567890123456789012345678901234567890123456789012345678901234567890123456789'@'localhost';
351+
DROP USER 'O1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567'@'localhost';
352352

353353
FLUSH PRIVILEGES;
354354

‎mysql-test/main/explain_non_select.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ INSERT INTO t1 VALUES (1),(2);
229229
EXPLAIN UPDATE v1, mysql.user SET v1.a = v1.a + 1;
230230
id select_type table type possible_keys key key_len ref rows Extra
231231
1 SIMPLE t1 ALL NULL NULL NULL NULL 2
232-
1 SIMPLE global_priv index NULL PRIMARY 420 NULL 5 Using index
232+
1 SIMPLE global_priv index NULL PRIMARY 1149 NULL 5 Using index
233233
DROP TABLE t1;
234234
DROP VIEW v1;
235235
#

‎mysql-test/main/func_system.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ show create table t1;
4747
Table Create Table
4848
t1 CREATE TABLE `t1` (
4949
`database()` varchar(34) CHARACTER SET utf8 DEFAULT NULL,
50-
`user()` varchar(141) CHARACTER SET utf8 DEFAULT NULL,
50+
`user()` varchar(384) CHARACTER SET utf8 DEFAULT NULL,
5151
`version` char(60) DEFAULT NULL
5252
) ENGINE=MyISAM DEFAULT CHARSET=latin1
5353
drop table t1;

‎mysql-test/main/grant.result

Lines changed: 23 additions & 23 deletions
Large diffs are not rendered by default.

‎mysql-test/main/grant.test

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -905,41 +905,41 @@ USE test;
905905
GRANT CREATE ON mysqltest.* TO longer_than_80_456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789@localhost;
906906

907907
--error ER_WRONG_STRING_LENGTH
908-
GRANT CREATE ON mysqltest.* TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
908+
GRANT CREATE ON mysqltest.* TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
909909

910910
--error ER_WRONG_STRING_LENGTH
911911
REVOKE CREATE ON mysqltest.* FROM longer_than_80_456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789@localhost;
912912

913913
--error ER_WRONG_STRING_LENGTH
914-
REVOKE CREATE ON mysqltest.* FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
914+
REVOKE CREATE ON mysqltest.* FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTYabcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
915915

916916
# Working with table-level privileges.
917917

918918
--error ER_WRONG_STRING_LENGTH
919919
GRANT CREATE ON t1 TO longer_than_80_456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789@localhost;
920920

921921
--error ER_WRONG_STRING_LENGTH
922-
GRANT CREATE ON t1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
922+
GRANT CREATE ON t1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
923923

924924
--error ER_WRONG_STRING_LENGTH
925925
REVOKE CREATE ON t1 FROM longer_than_80_456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789@localhost;
926926

927927
--error ER_WRONG_STRING_LENGTH
928-
REVOKE CREATE ON t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
928+
REVOKE CREATE ON t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
929929

930930
# Working with routine-level privileges.
931931

932932
--error ER_WRONG_STRING_LENGTH
933933
GRANT EXECUTE ON PROCEDURE p1 TO longer_than_80_456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789@localhost;
934934

935935
--error ER_WRONG_STRING_LENGTH
936-
GRANT EXECUTE ON PROCEDURE p1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
936+
GRANT EXECUTE ON PROCEDURE p1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
937937

938938
--error ER_WRONG_STRING_LENGTH
939939
REVOKE EXECUTE ON PROCEDURE p1 FROM longer_than_80_456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789@localhost;
940940

941941
--error ER_WRONG_STRING_LENGTH
942-
REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
942+
REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;
943943

944944

945945
#

‎mysql-test/main/grant_4332.result

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ alter table mysql.event modify definer char(77) collate utf8_bin not null defaul
1111
flush privileges;
1212
select user();
1313
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
14-
def user() 253 77 14 N 1 39 8
14+
def user() 253 272 14 N 1 39 8
1515
user()
1616
root@localhost
1717
create user a17aaaaaaaaaaaaa0@localhost;
@@ -20,17 +20,17 @@ grant usage on *.* to a17aaaaaaaaaaaaa0@lodalhost;
2020
ERROR HY000: String 'a17aaaaaaaaaaaaa0' is too long for user name (should be no longer than 16)
2121
drop user a17aaaaaaaaaaaaa0@lodalhost;
2222
ERROR HY000: String 'a17aaaaaaaaaaaaa0' is too long for user name (should be no longer than 16)
23-
alter table mysql.user modify User char(80) binary not null default '';
24-
alter table mysql.db modify User char(80) binary not null default '';
25-
alter table mysql.tables_priv modify User char(80) binary not null default '';
26-
alter table mysql.columns_priv modify User char(80) binary not null default '';
27-
alter table mysql.procs_priv modify User char(80) binary not null default '';
28-
alter table mysql.proc modify definer char(141) collate utf8_bin not null default '';
29-
alter table mysql.event modify definer char(141) collate utf8_bin not null default '';
23+
alter table mysql.user modify User char(128) binary not null default '';
24+
alter table mysql.db modify User char(128) binary not null default '';
25+
alter table mysql.tables_priv modify User char(128) binary not null default '';
26+
alter table mysql.columns_priv modify User char(128) binary not null default '';
27+
alter table mysql.procs_priv modify User char(128) binary not null default '';
28+
alter table mysql.proc modify definer varchar(384) collate utf8_bin not null default '';
29+
alter table mysql.event modify definer varchar(384) collate utf8_bin not null default '';
3030
flush privileges;
3131
select user();
3232
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
33-
def user() 253 141 14 N 1 39 8
33+
def user() 253 384 14 N 1 39 8
3434
user()
3535
root@localhost
3636
set global sql_mode=default;

‎mysql-test/main/grant_4332.test

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ grant usage on *.* to a17aaaaaaaaaaaaa0@lodalhost;
3030
--error ER_WRONG_STRING_LENGTH
3131
drop user a17aaaaaaaaaaaaa0@lodalhost;
3232

33-
alter table mysql.user modify User char(80) binary not null default '';
34-
alter table mysql.db modify User char(80) binary not null default '';
35-
alter table mysql.tables_priv modify User char(80) binary not null default '';
36-
alter table mysql.columns_priv modify User char(80) binary not null default '';
37-
alter table mysql.procs_priv modify User char(80) binary not null default '';
38-
alter table mysql.proc modify definer char(141) collate utf8_bin not null default '';
39-
alter table mysql.event modify definer char(141) collate utf8_bin not null default '';
33+
alter table mysql.user modify User char(128) binary not null default '';
34+
alter table mysql.db modify User char(128) binary not null default '';
35+
alter table mysql.tables_priv modify User char(128) binary not null default '';
36+
alter table mysql.columns_priv modify User char(128) binary not null default '';
37+
alter table mysql.procs_priv modify User char(128) binary not null default '';
38+
alter table mysql.proc modify definer varchar(384) collate utf8_bin not null default '';
39+
alter table mysql.event modify definer varchar(384) collate utf8_bin not null default '';
4040
flush privileges;
4141

4242
--enable_metadata

‎mysql-test/main/grant_lowercase.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ Warnings:
1515
Warning 1265 Data truncated for column 'Db' at row 1
1616
flush privileges;
1717
delete from mysql.db where db like '=>%';
18-
alter table mysql.db modify Db char(64) default "", modify User char(80) default "";
18+
alter table mysql.db modify Db char(64) default "", modify User char(128) default "";
1919
flush privileges;

0 commit comments

Comments
 (0)