database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be stopped with no-zero size)

Browse Source
This commit is contained in:
Oleksandr Byelkin
2015-08-11 18:45:38 +02:00
committed by Sergei Golubchik
parent 21daa7b929
commit e3982cead2
429 changed files with 1480 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/perfschema/r/column_privilege.result
View File

@@ -2,6 +2,7 @@ show grants;
Grants for root@localhost
GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION
create user 'pfs_user_5'@localhost;
grant usage on *.* to 'pfs_user_5'@localhost with GRANT OPTION;
grant SELECT(thread_id, event_id) on performance_schema.events_waits_current
to 'pfs_user_5'@localhost;

1
mysql-test/suite/perfschema/r/global_read_lock.result
View File

@@ -1,5 +1,6 @@
use performance_schema;
update performance_schema.setup_instruments set enabled='YES';
create user pfsuser@localhost;
grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost;
flush privileges;
connect (con1, localhost, pfsuser, , test);

1
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
View File

@@ -23,6 +23,7 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'192.0.2.4';
grant select on test.* to 'root'@'192.0.2.4';
select "Con1 is alive";
Con1 is alive

1
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
View File

@@ -23,6 +23,7 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'192.0.2.4';
grant select on test.* to 'root'@'192.0.2.4';
select "Con1 is alive";
Con1 is alive

1
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
View File

@@ -23,6 +23,7 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'santa.claus.ipv4.example.com';
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
select "Con1 is alive";
Con1 is alive

2
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
View File

@@ -23,7 +23,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'santa.claus.ipv4.example.com';
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
create user 'root'@'192.0.2.4';
grant select on test.* to 'root'@'192.0.2.4';
select "Con1 is alive";
Con1 is alive

1
mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
View File

@@ -24,6 +24,7 @@ select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
select @@global.max_connect_errors into @saved_max_connect_errors;
set global max_connect_errors = 3;
create user 'root'@'santa.claus.ipv4.example.com';
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
create user 'quota'@'santa.claus.ipv4.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';

2
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
View File

@@ -23,7 +23,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'192.0.2.4';
grant select on test.* to 'root'@'192.0.2.4';
create user 'root'@'santa.claus.ipv4.example.com';
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
select "Con1 is alive";
Con1 is alive

1
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
View File

@@ -23,6 +23,7 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'192.0.2.4';
grant select on test.* to 'root'@'192.0.2.4';
select "Con1 is alive";
Con1 is alive

1
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
View File

@@ -23,6 +23,7 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'2001:db8::6:6';
select "Con1 is alive";
Con1 is alive

1
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
View File

@@ -23,6 +23,7 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'2001:db8::6:6';
select "Con1 is alive";
Con1 is alive

1
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
View File

@@ -23,6 +23,7 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'santa.claus.ipv6.example.com';
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
select "Con1 is alive";
Con1 is alive

2
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
View File

@@ -23,7 +23,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'santa.claus.ipv6.example.com';
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
create user 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'2001:db8::6:6';
select "Con1 is alive";
Con1 is alive

1
mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
View File

@@ -24,6 +24,7 @@ select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
select @@global.max_connect_errors into @saved_max_connect_errors;
set global max_connect_errors = 3;
create user 'root'@'santa.claus.ipv6.example.com';
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
create user 'quota'@'santa.claus.ipv6.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';

2
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
View File

@@ -23,7 +23,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'2001:db8::6:6';
create user 'root'@'santa.claus.ipv6.example.com';
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
select "Con1 is alive";
Con1 is alive

1
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
View File

@@ -23,6 +23,7 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
create user 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'2001:db8::6:6';
select "Con1 is alive";
Con1 is alive

3
mysql-test/suite/perfschema/r/privilege.result
View File

@@ -2,6 +2,9 @@ show grants;
Grants for root@localhost
GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION
create user 'pfs_user_1'@localhost;
create user 'pfs_user_2'@localhost;
create user 'pfs_user_3'@localhost;
grant ALL on *.* to 'pfs_user_1'@localhost with GRANT OPTION;
grant ALL on performance_schema.* to 'pfs_user_2'@localhost
with GRANT OPTION;

1
mysql-test/suite/perfschema/r/read_only.result
View File

@@ -1,5 +1,6 @@
use performance_schema;
set @start_read_only= @@global.read_only;
create user pfsuser@localhost;
grant SELECT, UPDATE on performance_schema.* to pfsuser@localhost;
flush privileges;
connect (con1, localhost, pfsuser, , test);

5
mysql-test/suite/perfschema/r/setup_actors.result
View File

@@ -17,10 +17,15 @@ hostb % %
hosta user1 %
% user2 %
localhost user3 %
create user user1@localhost;
grant ALL on *.* to user1@localhost;
create user user2@localhost;
grant ALL on *.* to user2@localhost;
create user user3@localhost;
grant ALL on *.* to user3@localhost;
create user user4@localhost;
grant ALL on *.* to user4@localhost;
create user user5@localhost;
grant select on test.* to user5@localhost;
flush privileges;
# Switch to (con1, localhost, user1, , )

2
mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result
View File

@@ -33,11 +33,13 @@ ERROR 28000: Access denied for user 'boot0123456789'@'localhost' (using password
# 2.5 Connect should pass, host = localhost
# length of user name = 10 character
# length of default db = 9 character
CREATE USER 'root012345'@'localhost';
GRANT ALL PRIVILEGES ON *.* TO 'root012345'@'localhost';
DROP USER 'root012345'@'localhost';
# 2.6 Connect should pass, host = localhost
# length of user name = 14 character
# length of default db = 9 character
CREATE USER 'root0123456789'@'localhost';
GRANT ALL PRIVILEGES ON *.* to 'root0123456789'@'localhost';
DROP USER 'root0123456789'@'localhost';
# 2.7 Connect should pass, host = my_localhost

2
mysql-test/suite/perfschema/r/stage_mdl_global.result
View File

@@ -6,6 +6,8 @@ user1 statement/sql/flush flush tables with read lock
username event_name nesting_event_type
username event_name nesting_event_type
user1 stage/sql/init STATEMENT
user1 stage/sql/Waiting for query cache lock STATEMENT
user1 stage/sql/init STATEMENT
user1 stage/sql/query end STATEMENT
user1 stage/sql/closing tables STATEMENT
user1 stage/sql/freeing items STATEMENT